Merge branch 'master' into toycuffs

maybe fixing things?
This commit is contained in:
Mithrandalf
2018-12-29 20:15:23 +00:00
7 changed files with 51 additions and 5 deletions
@@ -72,6 +72,7 @@
new /obj/item/clothing/mask/breath( src )
new /obj/item/tank/emergency_oxygen( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/glowstick/emergency( src )
return
/obj/item/storage/box/survival_vox
@@ -83,6 +84,7 @@
new /obj/item/clothing/mask/breath/vox(src)
new /obj/item/tank/emergency_oxygen/nitrogen(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/glowstick/emergency(src)
/obj/item/storage/box/survival_plasmaman
icon_state = "box_plasma"
@@ -93,6 +95,7 @@
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/emergency_oxygen/plasma(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/glowstick/emergency(src)
/obj/item/storage/box/engineer
icon_state = "box_eng"
@@ -102,6 +105,7 @@
new /obj/item/clothing/mask/breath( src )
new /obj/item/tank/emergency_oxygen/engi( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/glowstick/emergency( src )
return
/obj/item/storage/box/survival_mining
@@ -113,6 +117,7 @@
new /obj/item/tank/emergency_oxygen/engi(src)
new /obj/item/crowbar/red(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/glowstick/emergency(src)
/obj/item/storage/box/survival_syndi
icon_state = "box_syndi"