Mloc-Argent
|
712e209ab6
|
Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
code/__HELPERS/text.dm
code/game/machinery/podmen.dm
code/game/machinery/vending.dm
code/game/objects/items/candle.dm
code/game/objects/items/devices/PDA/cart.dm
code/modules/clothing/suits/jobs.dm
|
2014-09-10 22:14:37 +01:00 |
|
Whitellama
|
f5c9586153
|
Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.
|
2014-08-31 02:12:04 -07:00 |
|
Kelenius
|
a1348faa8c
|
Cables are now stacks
|
2014-08-25 18:54:35 +04:00 |
|
mwerezak
|
aeb587f90b
|
Allows necrosis to be fixed with peridaxon and surgery
|
2014-07-06 13:02:58 -04:00 |
|
Zuhayr
|
342bee81d4
|
Merge pull request #5284 from boopcat/happydrones
more fixes!
|
2014-06-18 08:58:00 +09:30 |
|
Boop
|
c7d745e9c1
|
fixed some weird slime runtime that's been around forever apparently
|
2014-06-17 23:30:25 +01:00 |
|
mwerezak
|
1b33ca943d
|
Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
|
2014-06-15 20:25:39 -04:00 |
|
Segrain
|
4df59faf76
|
Surgery tracking.
|
2014-01-31 16:28:24 +03:00 |
|
alex-gh
|
a48100da74
|
Reattaching a mindless head no longer results in a runtime error
|
2013-12-21 22:50:13 +01:00 |
|
Nanai
|
7b5d08e48f
|
Small fix for head reattachment surgery.
|
2013-10-30 17:20:18 -04:00 |
|
Nanai
|
504e49ffb2
|
Added a new surgery- Head reattachment, for the decapitationally challenged. Performed via retractor, fix-o-vein, hemostat, cautery, head. Fixed logs and messages for decapitated brain removal - No longer shows as the head cutting the head open, and no longer shows the debrainee as the debrainer to admins.
|
2013-10-28 07:57:24 -04:00 |
|