Commit Graph

23 Commits

Author SHA1 Message Date
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr
9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +09:30
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
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
Chinsky
0e08c90571 Merge branch 'dev-freeze' into dev
Conflicts:
	maps/tgstation2.dmm
2014-03-10 19:05:24 +04:00
yashaldie
69dfb92719 Fixes for slime surgery runtime
don't know why this works but it does and doesn't break other surgeries from what i can tell
2014-03-07 04:55:23 -05:00
Ccomp5950
c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00
yashaldie
61a4e37466 fixes IPC brain surgery
could not start the brain surgery on IPCs this should fix it
2014-03-03 01:18:31 -05:00
ZekeSulastin
2b3c2064da Initial run of surgery steps for laser scalpels 2014-02-25 15:44:01 -05:00
LightningIron
b5671e8bd8 Surgery grammar fixes 2013-11-10 13:08:44 -06:00
Segrain
cf4f9ba054 Typo fix, retractor step bugfix. 2013-07-25 03:06:06 +03:00
Zuhayr
a16c8e0595 Fixes #3081 2013-06-21 18:00:25 -07:00
Chinsky
9ab9631ae6 Since organ processing interval is so big, sets bleeding manually so hemostat step would work. 2013-05-28 18:27:40 +04: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
fd2f37428b Made limb surgery not EXPLODE robotic limbs 2013-02-23 03:58:32 +04:00
Chinsky
4a6f719f35 Added crowbar as alternative to retractor. 2013-02-20 15:57:50 +04:00
Chinsky
2b7da59f1f Readded limb cutoff surgery. 2013-02-09 22:43:39 +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