Merge pull request #7832 from Fox-McCloud/lungsss

Breathing is Now Handled on Lungs
This commit is contained in:
tigercat2000
2017-12-01 17:51:19 -08:00
committed by GitHub
62 changed files with 513 additions and 751 deletions
@@ -251,23 +251,23 @@
..()
/obj/item/weapon/dnainjector/nobreath
name = "DNA-Injector (No Breath)"
name = "DNA-Injector (Breathless)"
desc = "Hold your breath and count to infinity."
datatype = DNA2_BUF_SE
value = 0xFFF
//block = 2
New()
block = NOBREATHBLOCK
block = BREATHLESSBLOCK
..()
/obj/item/weapon/dnainjector/antinobreath
name = "DNA-Injector (Anti-No Breath)"
name = "DNA-Injector (Anti-Breathless)"
desc = "Hold your breath and count to 100."
datatype = DNA2_BUF_SE
value = 0x001
//block = 2
New()
block = NOBREATHBLOCK
block = BREATHLESSBLOCK
..()
/obj/item/weapon/dnainjector/remoteview
@@ -51,7 +51,6 @@
if(C.internal == src)
to_chat(C, "<span class='notice'>You close \the [src] valve.</span>")
C.internal = null
C.update_internals_hud_icon(0)
else
var/can_open_valve = 0
if(C.get_organ_slot("breathing_tube"))
@@ -71,7 +70,6 @@
if(!silent)
to_chat(C, "<span class='notice'>You open \the [src] valve.</span>")
C.internal = src
C.update_internals_hud_icon(1)
else
if(!silent)
to_chat(C, "<span class='notice'>You are not wearing a suitable mask or helmet.</span>")