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

..

assembly.dm

Kills off Object and Fast Object Processes

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

bomb.dm

Portal fixes - adds oldloc to Crossed()

2019-07-15 20:16:17 +02:00

health.dm

Kills off Object and Fast Object Processes

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

helpers.dm

…

holder.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix

2019-08-09 23:38:49 +02:00

igniter.dm

Cleans up assembly code

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

infrared.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix

2019-08-09 23:38:49 +02:00

mousetrap.dm

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

2019-09-21 12:40:07 -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