670aac5785
Should properly unfuck savefiles
2015-03-16 20:12:09 +01:00
5242a08a2b
Fixes #8375
...
UNTESTED I DONT KNOW WHAT IS GOING ON AAAAAAA
2015-03-16 20:03:05 +01:00
b87300e712
Fixes donuts not having a uniquee filling color
2015-03-16 19:51:06 +01:00
4b596b4b72
Small optimization.
2015-03-16 18:16:12 +00:00
9af4972c40
Movement slowdowns only ignored with a jetpack.
2015-03-16 17:49:05 +00:00
41279b3c03
Fixes spawned food not having normal amounts of nutriment and other reagents.
...
Upgraded microwave now adds more nutriment, vitamin and other reagents to the food it cooks.
2015-03-16 18:47:01 +01:00
9c148ff13e
Merge pull request #8315 from phil235/BigUserdanger
...
Makes the message when you're attacked slightly bigger
2015-03-16 18:30:21 +11:00
fb6aa85094
Merge pull request #8274 from Thunder12345/techshellening
...
Shotgun party, new shells, an improvement and a fix
2015-03-16 18:30:14 +11:00
5c813bfd72
No additional movement delay when using a jetpack in zero gravity.
...
Remove unnecessary checks.
2015-03-16 04:08:12 +00:00
1d9d781b59
Adds a little consent system for sentience potions
...
Fixes an unreported runtime
2015-03-15 20:54:36 -04:00
2e43283964
Fix runtime.
2015-03-16 00:44:10 +00:00
fcd6718c56
Merge pull request #8309 from phil235/BurgerSpriteFix
...
Fixes burger and sandwich ingredient stacking and sprites.
2015-03-16 01:40:15 +03:00
2830325e4e
Merge pull request #8173 from AnturK/flagfix
...
Fixes pref flags
2015-03-15 23:02:58 +01:00
aaac85707f
Merge pull request #8204 from Iamgoofball/patch-41
...
Nerfs acid blob again
2015-03-15 15:56:23 -05:00
ca132952f9
Fixes the ore redemption machine outputting zero amount stacks.
2015-03-15 19:26:54 +00:00
4f1e20bd84
Merge pull request #8348 from phil235/DoughHotfix
...
Fix dough and cakebatter recipes.
2015-03-15 16:30:20 +03:00
78d28a6d64
Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
...
Conflicts:
code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
e3e881e6ee
Merge branch 'master' of https://github.com/tgstation/-tg-station into MimanaFix
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
2015-03-15 12:27:40 +01:00
791b229388
Merge branch 'master' of https://github.com/tgstation/-tg-station into BurgerSpriteFix
...
Conflicts:
icons/obj/food.dmi
2015-03-15 12:21:45 +01:00
5cc3b68d6a
pong
2015-03-15 05:22:07 -04:00
05097332ce
ding
2015-03-15 05:08:29 -04:00
d8b1cc36b7
Merge pull request #8328 from Miauw62/asdfjo
...
Chat toggles are saved to the savefile properly again.
2015-03-15 02:20:09 -05:00
3bc34e5383
Merge pull request #8310 from phil235/RussianRevolverFix
...
Fixes russian revolver's special mechanism message
2015-03-15 01:57:46 -05:00
da1e6f57f0
Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
...
Code cleanup
2015-03-15 01:55:39 -05:00
abb835b487
revamps ERT hardsuits to use the helmet toggle, organizes the listing to be slightly better looking.
2015-03-15 02:03:18 -04:00
5fd5d0b8c1
Color cleaning effects removed from space cleaner and water pending future changes to colors in a future PR.
2015-03-14 22:24:58 -07:00
d0f101cd37
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-03-14 21:32:13 -07:00
33ffd33180
fixes and tweaks
2015-03-14 21:13:23 -07:00
8e2962c4ab
Merge pull request #8255 from GunHog/SiliconVerbFix
...
Fixes "Sensor Augmentation" showing in silicon verbs
2015-03-14 23:08:19 -05:00
1732ab6b02
Merge pull request #8311 from phil235/SprayFix
...
Fixes chemsprayer duplicating reagents. Simplifying its code.
2015-03-14 22:59:49 -05:00
0b7be73f62
Merge pull request #8286 from phil235/SteelcapFix
...
Steel cap, sandstone and welding fixes plus flashing refactor
2015-03-14 22:56:37 -05:00
7114d5ac04
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Goon-Medicine.dm
2015-03-14 20:00:35 -07:00
fa75aed6d3
Reverts 3tick and 1tick
2015-03-14 19:51:54 -07:00
94bb6f9fd6
lmao
2015-03-14 21:04:37 -04:00
8ee898d67a
ayy
2015-03-14 21:04:11 -04:00
0cdffeecfb
Merge pull request #8296 from phil235/TablecraftFix
...
Tablecraft Fix and recipe detection
2015-03-14 19:41:56 -05:00
7c305305b7
Fix reagent garbage collection hopefully
...
I say hopefully because stuff that collects successfully locally likes to fail on sybil.
2015-03-14 16:52:49 -07:00
0232afd05d
Fix typo in catalyst.
...
Fix flamethrower crafting recipe (now only use 1 rod, calls checkparts() to set up the weldingtool and igniter).
Fix lack of message when trying to turn on an unsecured welding tool.
Fix lack of icon update when clicking plasma tank with empty flamethrower.
2015-03-15 00:23:47 +01:00
913d64b9a7
Fix dough and cakebatter recipes.
2015-03-14 23:59:56 +01:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
1027c7619c
Merge pull request #8206 from RemieRichards/AILessProcessing
...
Hostile Mob AI Optimisation
2015-03-14 16:21:22 -05:00
52dfa42eb5
Merge pull request #8257 from phil235/ReflectFix
...
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
565ac0b4de
quickfix
2015-03-14 14:38:01 -04:00
17a9556798
Adds 3 new bear-related foods. Now with 100% less 4k+ line changes.
2015-03-14 14:22:29 -04:00
05718664cf
Docile slime AI won't try to break your pull when you pull them
2015-03-14 13:43:33 -04:00
1e720ae033
More work on living/life.dm(), simple_animal/life() and robot/life().
2015-03-14 16:30:59 +01:00
f70084ecab
Merge pull request #8227 from phil235/HulkCritFix
...
Hulk crit fixes
2015-03-13 22:56:51 -05:00
62f4cf0d51
what am i doing with my life
2015-03-13 22:47:18 -05:00
ecb3a4e08f
Merge pull request #8236 from phil235/DoughChange
...
Dough change
2015-03-13 15:34:39 -05:00
e5428c1519
Merge pull request #8256 from phil235/StrangenessTextFix
...
Strangeness text, janicart, alien nest, weak golem fixes
2015-03-13 15:23:30 -05:00
Swag McYolosteinen
phil235
xxalpha
Jordie
Incoming
Razharas
phil235
Cheridan
MMMiracles
Iamgoofball
MrPerson
Cheridan