Zuhayr
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
LightningIron
7de4825a87
Changes some messages to make more sense
2014-08-24 14:09:39 -05:00
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
mwerezak
5b341bd810
IB initial damage now depends on damage taken
...
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
2014-08-16 22:00:55 -04:00
Hubblenaut
1602cb883c
Surgical tools that are nowhere near the patient don't cause a fail step
2014-08-17 02:34:25 +02:00
Hubblenaut
cbb0a3c0b7
Fixes a surgery oversight regarding text coloring
2014-08-17 02:21:32 +02:00
Zuhayr
f4ff51f146
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-16 19:32:00 +09:30
Zuhayr
f795712a95
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-07-16 19:30:41 +09:30
Zuhayr
16c1494d7f
Merge pull request #5613 from comma/master
...
Fixes #5563
2014-07-14 15:49:19 +09:30
Chinsky
bb6eedf193
Fixes #5563
2014-07-14 08:28:14 +04:00
Kelenius
aad89409de
Slime update
2014-07-13 17:37:30 +04:00
mwerezak
c0487b9c90
Fixes human internal organs list
2014-07-12 16:15:37 -04:00
mwerezak
aeb587f90b
Allows necrosis to be fixed with peridaxon and surgery
2014-07-06 13:02:58 -04:00
Mloc-Argent
dd7f0dac0e
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/computer/card.dm
code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01:00
Hubblenaut
8a4739197e
Merge branch 'backup' into medical
2014-06-19 15:36:28 +02:00
Hubblenaut
5e8a82bb0a
Fixes text color in advanced trauma kit surgery step
2014-06-18 23:11:01 +02: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
Ccomp5950
084c0754ad
Code effeciency project: HUD items rewrite
...
Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.
After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.
Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm
2014-03-09 10:25:36 -05:00
Ccomp5950
63e0c5b980
Merge pull request #4539 from yashaldie/master
...
Fix for slime surgery runtime & o2 lockers bug
2014-03-09 01:39:30 -06:00
yashaldie
421b1ea6ef
Fixes for slime surgery runtime
...
don't know why the slime is coming though even though the target is supposed to be human...
2014-03-07 04:56:49 -05: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
Chinsky
98b45e52ac
Merge pull request #4518 from yashaldie/master
...
fixes IPC brain surgery
2014-03-04 18:18:33 +04: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
Segrain
b7059519c2
Merge remote-tracking branch 'upstream/master' into dev
2014-02-03 04:36:03 +03:00
DJSnapshot
810de4ddaa
Merge pull request #4337 from Baystation12/dev-freeze
...
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
Segrain
4df59faf76
Surgery tracking.
2014-01-31 16:28:24 +03:00
Zuhayr
4a0fb22530
IPC brain surgery code.
2014-01-29 16:01:25 +10:30
Zuhayr
69d260a11d
Preliminary surgery work for IS_SYNTHETIC.
2014-01-28 16:00:36 +10:30
Zuhayr
d783fd5043
Manual binary merge of head icons.
2013-12-22 23:23:25 +10:30
Zuhayr
b9fcd34df3
Merged config and changelog.
2013-12-22 23:11:29 +10:30
alex-gh
a48100da74
Reattaching a mindless head no longer results in a runtime error
2013-12-21 22:50:13 +01:00
Zuhayr
822b572962
Plopped the borer out of the skull when the brain is removed.
2013-12-18 13:50:11 +10:30
Mloc
503302dae5
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/implants/implant.dm
code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
Nanai
5cce782c34
Tool definition fix.
...
Properly accounted for bruisepacks vs poultices under Chinsky's PR.
2013-11-15 19:26:28 -05:00
Mloc-Argent
cad2c524a8
Tree fixery.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-11-15 23:11:11 +00:00
Nanai
7ce2314c11
Merge Fixes
...
Fixes issues post merge and and with minor sanity checks and neatness.
2013-11-14 13:08:40 -05:00
Nanai
ae31f9cdcf
Surgery Update
...
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.
2013-11-14 13:08:31 -05:00
Nanai
a104453156
Added and Adjusted Chemicals
...
Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.
New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.
Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.
2013-11-14 13:08:30 -05:00
Nanai
cba1a9585d
Medical Hoopery
...
Added eyes as an internal organ, removed the eye-stat var on mobs and changed it to properly direct it to eye damage. Altered all reference.
Updated the sleeper to allow for ejection of the beakers and occupants in panel.
Updated the body scanner to check for prosthetics/mechanized organs, and inform the individual of the blind disability.
Laid the groundwork for mechanical and assisted internal organs.
Groundwork for chemical: Peridaxon, a chemical that allows for the slow regeneration from organ damage.
2013-11-14 12:40:30 -05:00
Nanai
25c55ed354
Germ Fix
...
Fix for missing and robotic limbs getting infected with germs and being incurable.
2013-11-14 12:39:51 -05:00
Mloc-Argent
e6b44d0f35
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
2013-11-14 12:03:59 +00:00
LightningIron
b5671e8bd8
Surgery grammar fixes
2013-11-10 13:08:44 -06: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
