diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index cba2aa80080..fb3d3f3e2dc 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -2328,6 +2328,15 @@ ..() reagents.add_reagent("inaprovaline", 30) +/obj/item/weapon/reagent_containers/pill/dexalin + name = "Dexalin pill" + desc = "Used to treat oxygen deprivation." + icon_state = "pill16" + + New() + ..() + reagents.add_reagent("dexalin", 30) + //Dispensers /obj/reagent_dispensers/watertank name = "watertank" diff --git a/code/defines/obj/clothing.dm b/code/defines/obj/clothing.dm index 95ad8332f17..3b6cde9a5de 100644 --- a/code/defines/obj/clothing.dm +++ b/code/defines/obj/clothing.dm @@ -199,10 +199,11 @@ item_state = "pwig" /obj/item/clothing/head/that - name = "hat" + name = "Top hat" desc = "An amish looking hat" icon_state = "tophat" item_state = "that" + flags = FPRINT|TABLEPASS|HEADSPACE /obj/item/clothing/head/wizard name = "wizard hat" diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 0b44d5014d7..ca944ea704e 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -88,6 +88,11 @@ icon_state = "antitoxin" item_state = "firstaid-toxin" +/obj/item/weapon/storage/firstaid/o2 + name = "Oxygen Deprivation First Aid" + icon_state = "o2" + item_state = "firstaid-o2" + /obj/item/weapon/storage/flashbang_kit desc = "WARNING: Do not use without reading these preautions!\nThese devices are extremely dangerous and can cause blindness or deafness if used incorrectly.\nThe chemicals contained in these devices have been tuned for maximal effectiveness and due to\nextreme safety precuaiotn shave been incased in a tamper-proof pack. DO NOT ATTEMPT TO OPEN\nFLASH WARNING: Do not use continually. Excercise extreme care when detonating in closed spaces.\n\tMake attemtps not to detonate withing range of 2 meters of the intended target. It is imperative\n\tthat the targets visit a medical professional after usage. Damage to eyes increases extremely per\n\tuse and according to range. Glasses with flash resistant filters DO NOT always work on high powered\n\tflash devices such as this. EXERCISE CAUTION REGARDLESS OF CIRCUMSTANCES\nSOUND WARNING: Do not use continually. Visit a medical professional if hearing is lost.\n\tThere is a slight chance per use of complete deafness. Exercise caution and restraint.\nSTUN WARNING: If the intended or unintended target is too close to detonation the resulting sound\n\tand flash have been known to cause extreme sensory overload resulting in temporary\n\tincapacitation.\nDO NOT USE CONTINUALLY\nOperating Directions:\n\t1. Pull detonnation pin. ONCE THE PIN IS PULLED THE GRENADE CAN NOT BE DISARMED!\n\t2. Throw grenade. NEVER HOLD A LIVE FLASHBANG\n\t3. The grenade will detonste 10 seconds hafter being primed. EXCERCISE CAUTION\n\t-Never prime another grenade until after the first is detonated\nNote: Usage of this pyrotechnic device without authorization is an extreme offense and can\nresult in severe punishment upwards of 10 years in prison per use.\n\nDefault 3 second wait till from prime to detonation. This can be switched with a screwdriver\nto 10 seconds.\n\nCopyright of Nanotrasen Industries- Military Armnaments Division\nThis device was created by Nanotrasen Labs a member of the Expert Advisor Corporation" name = "Flashbangs (WARNING)" diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index ddc30553f47..c606565735b 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -100,6 +100,7 @@ contains = list("/obj/item/weapon/storage/firstaid/regular", "/obj/item/weapon/storage/firstaid/fire", "/obj/item/weapon/storage/firstaid/toxin", + "/obj/item/weapon/storage/firstaid/o2", "/obj/item/weapon/reagent_containers/glass/bottle/antitoxin", "/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline", "/obj/item/weapon/reagent_containers/glass/bottle/stoxin", diff --git a/code/game/objects/closets/emergency.dm b/code/game/objects/closets/emergency.dm index a0e5e1c0e76..4cb6eaaf1d5 100644 --- a/code/game/objects/closets/emergency.dm +++ b/code/game/objects/closets/emergency.dm @@ -4,13 +4,14 @@ if (prob(40)) new /obj/item/weapon/storage/toolbox/emergency(src) - switch (pickweight(list("small" = 20, "mask" = 5, "tank" = 4, "both" = 2, "nothing" = 1, "delete" = 1))) + switch (pickweight(list("small" = 25, "aid" = 10, "tank" = 5, "both" = 5, "nothing" = 4, "delete" = 1))) if ("small") new /obj/item/weapon/tank/emergency_oxygen(src) new /obj/item/weapon/tank/emergency_oxygen(src) - if ("mask") - new /obj/item/clothing/mask/breath(src) + if ("aid") + new /obj/item/weapon/tank/emergency_oxygen(src) + new /obj/item/weapon/storage/firstaid/o2(src) if ("tank") new /obj/item/weapon/tank/air(src) diff --git a/code/game/objects/storage/firstaid.dm b/code/game/objects/storage/firstaid.dm index 54205954a3c..e3f9945e6a9 100644 --- a/code/game/objects/storage/firstaid.dm +++ b/code/game/objects/storage/firstaid.dm @@ -44,6 +44,18 @@ new /obj/item/device/healthanalyzer( src ) return +/obj/item/weapon/storage/firstaid/o2/New() + + ..() + new /obj/item/weapon/reagent_containers/pill/dexalin( src ) + new /obj/item/weapon/reagent_containers/pill/dexalin( src ) + new /obj/item/weapon/reagent_containers/pill/dexalin( src ) + new /obj/item/weapon/reagent_containers/pill/dexalin( src ) + new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src ) + new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src ) + new /obj/item/device/healthanalyzer( src ) + return + /obj/item/weapon/storage/pill_bottle/kelotane name = "Pill bottle (kelotane)" desc = "Contains pills used to treat burns." diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm index 229475e95bc..0669da5064a 100644 --- a/code/game/objects/tank.dm +++ b/code/game/objects/tank.dm @@ -260,7 +260,7 @@ /obj/item/weapon/tank/emergency_oxygen/New() ..() - src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) + src.air_contents.oxygen = (1*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) return /obj/item/weapon/tank/jetpack/New()