Commit Graph

2963 Commits

Author SHA1 Message Date
Fox McCloud
e884e76445 Updates Swarmers: Fixes Swarmer Megafauna (#12516) 2019-10-08 20:57:39 -04:00
Fox McCloud
93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage
Universal Object Damage
2019-10-06 23:22:48 -04:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
SteelSlayer
0e3a484c42 Fixes a bunch of things related to mindslaves (#12491) 2019-10-03 14:08:54 -04:00
farie82
82b6c821f6 Fixes toxic comp (#12490) 2019-10-03 09:20:00 -04:00
Fox McCloud
d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
variableundefined
e02a76aa73 Fixes too many items in the conscription kit #12436 2019-09-29 19:41:07 -07:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
Mars
8b87bd529c Slight refactor of conscription kit 2019-09-27 17:44:06 +02:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Mark van Alphen
6bd0d0813a Revert "Revert "Datumizes traitors and mindslaves"" (#12378) 2019-09-25 19:47:16 -07:00
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
652920ae3c Wizard Battlemage Armor (#12388) 2019-09-24 15:42:47 -07:00
Fox McCloud
86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
farie82
a185a1e537 Makes Toxic Compensation do the toxin damage it healed (#12383) 2019-09-24 15:12:16 -07:00
AzuleUtama
da0375028f Fixes incorrect description for Traitor's Meat Cleaver (#12397) 2019-09-23 15:25:53 -07:00
Fox McCloud
62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud
c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Dave
2230fc3227 Revert "Datumizes traitors and mindslaves (#11969)" (#12376) 2019-09-21 19:32:52 -07:00
SteelSlayer
94bb14bb29 Datumizes traitors and mindslaves (#11969) 2019-09-21 16:50:03 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Fox McCloud
d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
TDSSS
840559e9ae Buffs the uplink syringe gun, it now comes with some syringes (#12353) 2019-09-20 17:59:51 -07:00
Fox McCloud
cc151278d5 Removes Unfinished VR (#12341) 2019-09-20 17:58:41 -07:00
TDSSS
6197d0c2a6 Gives abductors an objective to stay hidden/limit crew disruption (#12260) 2019-09-19 07:18:38 -07:00
datlo
e6bea6ecdc Changes station goal crate to engi crates (#12308)
* Add lock to bee/station goal crates

* remove locks
2019-09-18 07:01:31 -07:00
Fox McCloud
6711f92099 Merge pull request #12326 from Couls/missing-keyword-args
fixes some missing arguments and runtimes
2019-09-17 21:03:11 -04:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Fox McCloud
1b1bd00c06 Updates Status Effects: Fixes Blood Drunk Status Effect, Buffs Regenerative Core (#12320) 2019-09-17 07:56:50 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Fox McCloud
51fc4b1c77 Merge pull request #12293 from variableundefined/newsecuritycrate
Add an officer starter pack crate
2019-09-16 16:07:19 -04:00
Dave
8403104980 No I didn't use the web editor 2019-09-16 12:47:22 -04:00
Dave
eba05d3e91 Shield desc fix 2019-09-16 12:23:08 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
variableundefined
189be4fb30 Add an officer starter pack crate 2019-09-13 23:23:58 -04:00
Fox McCloud
bdcdfc04f0 Hierophant Update 2019-09-13 19:35:41 -04:00
variableundefined
9c88e72cc3 Merge pull request #12271 from AzuleUtama/nukeOpsItemTweaks
Nuclear Operative Item Tweaks
2019-09-12 19:49:34 -04:00
AzuleUtama
c6d846b6b6 Nuclear Operative Item Tweaks 2019-09-11 21:25:44 +01:00
Fox McCloud
59082ff21a space dragonnnn 2019-09-11 13:52:33 -04:00
variableundefined
ee86b56d58 Merge pull request #12250 from Fox-McCloud/linda-upgrade-prep
Refactors Atmos Air Current Pushing
2019-09-11 01:28:55 -04:00
Fox McCloud
92f3edf853 tweaks to uplink 2019-09-11 01:20:30 -04:00
variableundefined
5ea0a9a7e3 Merge pull request #12242 from Fox-McCloud/ports-frozen-status-effect
Ports Frozen Status Effect
2019-09-10 19:38:31 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud
43ae1c832a Ports Frozen Status Effect 2019-09-09 02:45:09 -04:00
Fox McCloud
dddfc9cffb crate fixes 2019-09-08 11:16:54 -04:00
Fox McCloud
fde5769225 other vending machines 2019-09-08 10:59:04 -04:00
Fox McCloud
607343424b Refactors Vending Machines and Fixes Restocking Exploit 2019-09-08 08:41:08 -04:00