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
|
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 |
|
LightningIron
|
b5671e8bd8
|
Surgery grammar fixes
|
2013-11-10 13:08:44 -06:00 |
|
Chinsky
|
c84ce517e3
|
Changed way substitute tools are handled.
Now all tools have chance of success. Proper ones have 100.
If tool has less than 100 chance of success, it can fail the step.
|
2013-05-28 18:16:11 +04:00 |
|
Chinsky
|
e8f8138e04
|
Added priority system for surgery steps.
Steps with higher priority would be attempted first.
Added preparation step for item insertion surgery.
|
2013-02-22 23:06:37 +04:00 |
|
Chinsky
|
8b8556a1b1
|
Removed requirements for face surgery to cut open head too, real counterintuitive and looks like copypaste error >.>
|
2013-02-15 02:06:35 +04:00 |
|
Chinsky
|
7f84b415a8
|
Moved germ transferring and blood splatters in parent 'begin_step' of surgery steps.
|
2013-01-13 11:56:33 +04:00 |
|
Chinsky
|
3447c61e49
|
Moved surgery from WIP to modules, since it's not really that WIP anymore.
Split one huge file into several smaller ones for readability.
|
2013-01-13 02:11:06 +04:00 |
|