Mark van Alphen d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting ...

# Conflicts:
#	code/game/area/Space Station 13 areas.dm

2019-05-03 18:30:07 +02:00

..

organs

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

2019-05-03 18:30:07 +02:00

bones.dm

…

cavity_implant.dm

…

dental_implant.dm

…

encased.dm

…

generic.dm

…

helpers.dm

remove extra var, floor surgery, add med gripper

2019-01-26 02:47:38 +00:00

implant_removal.dm

…

limb_augmentation.dm

…

limb_reattach.dm

further conversion

2018-07-18 01:13:24 -04:00

organs_internal.dm

…

other.dm

updates resting var to use StopResting()

2018-10-08 12:22:46 +01:00

plastic_surgery.dm

further conversion

2018-07-18 01:13:24 -04:00

remove_embedded_object.dm

…

rig_removal.dm

…

robotics.dm

Update robotics.dm

2018-09-15 22:08:18 -05:00

slime.dm

…

surgery.dm

Fixed non-breating mobs adding to germ_level in surgery.

2019-02-02 13:40:05 +01:00

tools.dm

Suicide Refactor

2019-03-27 22:54:26 -04:00