Let inhalers go in a number of storage items

Also adds inhalers to random medical item spawns.
HearthOfHestia · Feb 5, 2022 · 1cf9d61 · 1cf9d61
1 parent 372a5c3
commit 1cf9d61
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 1 deletion.
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
@@ -166,6 +166,7 @@
 		/obj/item/clothing/head/surgery,
 		/obj/item/clothing/gloves/latex,
 		/obj/item/chems/hypospray,
+		/obj/item/chems/inhaler,
 		/obj/item/clothing/glasses/hud/health,
 		/obj/item/crowbar,
 		/obj/item/flashlight,

diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
@@ -172,6 +172,7 @@
 				/obj/item/stack/medical/advanced/ointment = 2,
 				/obj/item/stack/medical/splint = 1,
 				/obj/item/chems/hypospray/autoinjector = 3,
+				/obj/item/chems/inhaler = 3,
 				/obj/item/storage/pill_bottle/burn_meds = 2,
 				/obj/item/storage/pill_bottle/antitox = 2,
 				/obj/item/storage/med_pouch/trauma = 2,

diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm
@@ -36,6 +36,7 @@
 		/obj/item/gun,
 		/obj/item/storage/firstaid,
 		/obj/item/chems/hypospray,
+		/obj/item/chems/inhaler,
 		/obj/item/roller,
 		/obj/item/suit_cooling_unit
 	)
@@ -108,6 +109,7 @@
 		/obj/item/gun,
 		/obj/item/storage/firstaid, 
 		/obj/item/chems/hypospray, 
+		/obj/item/chems/inhaler, 
 		/obj/item/roller, 
 		/obj/item/suit_cooling_unit
 	)

diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
@@ -172,6 +172,7 @@
 		/obj/item/stack/medical,
 		/obj/item/chems/dropper,
 		/obj/item/chems/hypospray,
+		/obj/item/chems/inhaler,
 		/obj/item/chems/syringe,
 		/obj/item/scanner/health,
 		/obj/item/flashlight,
@@ -195,6 +196,7 @@
 		/obj/item/stack/medical,
 		/obj/item/chems/dropper,
 		/obj/item/chems/hypospray,
+		/obj/item/chems/inhaler,
 		/obj/item/chems/syringe,
 		/obj/item/scanner/health, 
 		/obj/item/flashlight,
@@ -215,6 +217,7 @@
 		/obj/item/stack/medical,
 		/obj/item/chems/dropper,
 		/obj/item/chems/hypospray,
+		/obj/item/chems/inhaler,
 		/obj/item/chems/syringe,
 		/obj/item/scanner/health,
 		/obj/item/flashlight,

diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
@@ -4,7 +4,20 @@
 	icon = 'icons/clothing/suit/labcoat/default.dmi'
 	blood_overlay_type = "coat"
 	body_parts_covered = SLOT_UPPER_BODY|SLOT_ARMS
-	allowed = list(/obj/item/scanner/gas,/obj/item/stack/medical,/obj/item/chems/dropper,/obj/item/chems/syringe,/obj/item/chems/hypospray,/obj/item/scanner/health,/obj/item/flashlight/pen,/obj/item/chems/glass/bottle,/obj/item/chems/glass/beaker,/obj/item/chems/pill,/obj/item/storage/pill_bottle,/obj/item/paper)
+	allowed = list(
+		/obj/item/scanner/gas,
+		/obj/item/stack/medical,
+		/obj/item/chems/dropper,
+		/obj/item/chems/syringe,
+		/obj/item/chems/hypospray,
+		/obj/item/chems/inhaler,
+		/obj/item/scanner/health,
+		/obj/item/flashlight/pen,
+		/obj/item/chems/glass/bottle,
+		/obj/item/chems/glass/beaker,
+		/obj/item/chems/pill,
+		/obj/item/storage/pill_bottle,
+		/obj/item/paper)
 	armor = list(
 		bio = ARMOR_BIO_RESISTANT
 		)

diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm
@@ -140,6 +140,7 @@
 		/obj/item/chems/syringe,
 		/obj/item/chems/hypospray,
 		/obj/item/chems/hypospray/autoinjector,
+		/obj/item/chems/inhaler,
 		/obj/item/syringe_cartridge,
 		/obj/item/plastique,
 		/obj/item/clothing/mask/smokable,

diff --git a/code/modules/surgery/_surgery.dm b/code/modules/surgery/_surgery.dm
@@ -6,6 +6,7 @@ var/global/list/surgery_tool_exceptions = list(
 	/obj/item/scanner/health,
 	/obj/item/shockpaddles,
 	/obj/item/chems/hypospray,
+	/obj/item/chems/inhaler,
 	/obj/item/modular_computer,
 	/obj/item/chems/syringe,
 	/obj/item/chems/borghypo