4 Commits

Author	SHA1	Message	Date
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
farie82	0e8ddb2afe	Refactors the examine proc to return a list of strings (#12280)	2019-09-25 22:05:01 -07:00
Fox McCloud	aa49033844	nor-shall-our-souls-falter	2019-09-17 16:06:09 -04:00
Fox McCloud	01a68b8895	Ports TG's Fultons	2019-08-18 18:22:07 -04:00