Upstream Sync

Syncs with ParadiseSS13/Paradise and fixes merge conflicts.

code/game/objects/effects/decals/warning_stripes.dm

@@ -52,6 +52,59 @@
 
 /obj/effect/decal/warning_stripes/New()
 	. = ..()
-
 	loc.overlays += src
-	del src
+	del src
+
+// Credit to Neinhaus for making these into individual decals.
+
+/obj/effect/decal/warning_stripes/arrow
+	icon_state = "4"
+
+/obj/effect/decal/warning_stripes/yellow
+	icon_state = "5"
+
+/obj/effect/decal/warning_stripes/yellow/partial
+	icon_state = "3"
+
+/obj/effect/decal/warning_stripes/yellow/hollow
+	icon_state = "6"
+
+
+/obj/effect/decal/warning_stripes/red
+	icon_state = "8"
+
+/obj/effect/decal/warning_stripes/red/partial
+	icon_state = "7"
+
+/obj/effect/decal/warning_stripes/red/hollow
+	icon_state = "9"
+
+
+/obj/effect/decal/warning_stripes/green
+	icon_state = "11"
+
+/obj/effect/decal/warning_stripes/green/partial
+	icon_state = "10"
+
+/obj/effect/decal/warning_stripes/green/hollow
+	icon_state = "12"
+
+
+/obj/effect/decal/warning_stripes/white
+	icon_state = "14"
+
+/obj/effect/decal/warning_stripes/white/partial
+	icon_state = "13"
+
+/obj/effect/decal/warning_stripes/white/hollow
+	icon_state = "15"
+
+
+/obj/effect/decal/warning_stripes/blue
+	icon_state = "17"
+
+/obj/effect/decal/warning_stripes/blue/partial
+	icon_state = "16"
+
+/obj/effect/decal/warning_stripes/blue/hollow
+	icon_state = "18"

code/game/objects/items/weapons/storage/boxes.dm

@@ -64,6 +64,7 @@
 		sleep(1)
 		new /obj/item/clothing/mask/breath( src )
 		new /obj/item/weapon/tank/emergency_oxygen( src )
+		new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
 		return
 
 /obj/item/weapon/storage/box/engineer/
@@ -73,6 +74,7 @@
 		sleep(1)
 		new /obj/item/clothing/mask/breath( src )
 		new /obj/item/weapon/tank/emergency_oxygen/engi( src )
+		new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
 		return
 
 

code/game/objects/items/weapons/storage/lockbox.dm

@@ -95,7 +95,8 @@
 	item_state = "syringe_kit"
 	w_class = 3
 	max_w_class = 2
-	storage_slots = 6
+	max_combined_w_class = 20 
+	storage_slots = 12
 	req_access = list(access_captain)
 	icon_locked = "medalbox+l"
 	icon_closed = "medalbox"

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -145,7 +145,7 @@
 	w_class = 2.0
 	force = 4.0
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
-	volume = 2 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
+	volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
 
 
 	New()
@@ -197,4 +197,23 @@
 	..()
 	if(air_contents.nitrogen < 10)
 		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
-		//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
+		//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
+
+
+/obj/item/weapon/tank/emergency_oxygen/vox
+	name = "vox specialized nitrogen tank"
+	desc = "A high-tech nitrogen tank designed specifically for Vox."
+	icon_state = "emergency_vox"
+	item_state = "emergency_vox"
+	icon_override = 'icons/mob/in-hand/tools.dmi'
+	volume = 25
+
+
+	New()
+		..()
+		src.air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+		src.air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+		//
+		src.air_contents.update_values()
+
+		return

code/game/objects/items/weapons/vending_items.dm

@@ -57,3 +57,18 @@
 	machine_name = "AutoDrobe"
 	icon_state = "refill_costume"
 	charges = 19// of 58
+	
+/obj/item/weapon/vending_refill/hatdispenser
+	machine_name = "hat"
+	icon_state = "refill_costume"
+	charges = 18// of 56
+
+/obj/item/weapon/vending_refill/suitdispenser
+	machine_name = "suit"
+	icon_state = "refill_costume"
+	charges = 68// of 206
+	
+/obj/item/weapon/vending_refill/shoedispenser
+	machine_name = "shoe"
+	icon_state = "refill_costume"
+	charges = 30// of 91

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -312,7 +312,7 @@
 	var/id = null
 
 	New()
-		new /obj/item/clothing/under/color/orange( src )
+		new /obj/item/clothing/under/color/orange/prison( src )
 		new /obj/item/clothing/shoes/orange( src )
 		return
 

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -136,9 +136,9 @@
 	icon_closed = "orange"
 
 /obj/structure/closet/wardrobe/orange/New()
-	new /obj/item/clothing/under/color/orange(src)
-	new /obj/item/clothing/under/color/orange(src)
-	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/color/orange/prison(src)
+	new /obj/item/clothing/under/color/orange/prison(src)
+	new /obj/item/clothing/under/color/orange/prison(src)
 	new /obj/item/clothing/shoes/orange(src)
 	new /obj/item/clothing/shoes/orange(src)
 	new /obj/item/clothing/shoes/orange(src)