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

..

assembly.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

bomb.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

health.dm

Kills off Object and Fast Object Processes

2019-04-23 23:53:40 -04:00

helpers.dm

…

holder.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

igniter.dm

Cleans up assembly code

2018-10-27 13:29:07 +01:00

infrared.dm

Refactors the examine proc to return a list of strings (#12280)

2019-09-25 22:05:01 -07:00

mousetrap.dm

Merge remote-tracking branch 'upstream/master' into universal-damage

2019-09-28 00:16:11 -04:00

proximity.dm

Kills off Object and Fast Object Processes

2019-04-23 23:53:40 -04:00

shock_kit.dm

Fully refactors Chairs, Stools & Beds. Adds a few fun bits

2018-09-14 18:40:42 +01:00

signaler.dm

though-this-world-may-be-broken

2019-09-15 05:53:43 -04:00

timer.dm

Kills off Object and Fast Object Processes

2019-04-23 23:53:40 -04:00

voice.dm

a completely inconspicuous PR

2019-01-18 19:39:24 +09:00