Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE

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

@@ -135,6 +135,8 @@
 		new /obj/item/storage/backpack/satchel_eng(src)
 	new /obj/item/storage/backpack/duffel/atmos(src)
 	new /obj/item/extinguisher(src)
+	new /obj/item/grenade/gas/oxygen(src)
+	new /obj/item/grenade/gas/oxygen(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/tank/emergency_oxygen/engi(src)

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

@@ -32,6 +32,7 @@
 	new /obj/item/gun/energy/gun(src)
 	new /obj/item/door_remote/captain(src)
 	new /obj/item/reagent_containers/food/drinks/mug/cap(src)
+	new /obj/item/tank/emergency_oxygen/double(src)
 
 
 /obj/structure/closet/secure_closet/hop

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

@@ -19,7 +19,7 @@
 	new /obj/item/clothing/glasses/night(src)
 
 /obj/structure/closet/syndicate/suits
-	desc = "It's a storage unit for operative space gear. Not fancy..."
+	desc = "It's a storage unit for operative space gear."
 
 /obj/structure/closet/syndicate/suits/New()
 	..()
@@ -30,7 +30,7 @@
 	new /obj/item/clothing/shoes/magboots/syndie(src)
 
 /obj/structure/closet/syndicate/nuclear
-	desc = "It's a storage unit for a Syndicate boarding party.."
+	desc = "It's a storage unit for a Syndicate boarding party."
 
 /obj/structure/closet/syndicate/nuclear/New()
 	..()
@@ -49,6 +49,21 @@
 	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
 	new /obj/item/pda/syndicate(src)
 
+/obj/structure/closet/syndicate/sst
+	desc = "It's a storage unit for an elite syndicate strike team's gear."
+
+/obj/structure/closet/syndicate/sst/New()
+	..()
+	new /obj/item/ammo_box/magazine/mm556x45(src)
+	new /obj/item/gun/projectile/automatic/l6_saw(src)
+	new /obj/item/tank/jetpack/oxygen/harness(src)
+	new /obj/item/storage/belt/military/sst(src)
+	new /obj/item/clothing/glasses/thermal(src)
+	new /obj/item/clothing/shoes/magboots/syndie/advance(src)
+	new /obj/item/clothing/mask/gas/syndicate(src)
+	new /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/sst(src)
+	new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src)
+
 /obj/structure/closet/syndicate/resources/
 	desc = "An old, dusty locker."
 

code/game/objects/structures/safe.dm

@@ -122,7 +122,7 @@ GLOBAL_LIST_EMPTY(safes)
 		switch(alert("What would you like to do?", "Thermal Drill", "Turn [drill_timer ? "Off" : "On"]", "Remove Drill", "Cancel"))
 			if("Turn On")
 				if(do_after(user, 2 SECONDS, target = src))
-					drill_timer = addtimer(CALLBACK(src, .proc/drill_open), time_to_drill)
+					drill_timer = addtimer(CALLBACK(src, .proc/drill_open), time_to_drill, TIMER_STOPPABLE)
 					drill_start_time = world.time
 					drill.soundloop.start()
 					update_icon()

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -59,6 +59,8 @@
 		if(usr.incapacitated())
 			to_chat(usr, "<span class='warning'>You can't do that right now!</span>")
 			return
+		if(!ishuman(usr))
+			return
 		usr.visible_message("<span class='notice'>[usr] grabs \the [src.name].</span>", "<span class='notice'>You grab \the [src.name].</span>")
 		var/C = new item_chair(loc)
 		usr.put_in_hands(C)
@@ -319,7 +321,6 @@
 	w_class = WEIGHT_CLASS_HUGE
 	origin_type = /obj/structure/chair/stool
 	break_chance = 0 //It's too sturdy.
-	var/obj/structure/chair/stool/origin = null
 
 /obj/item/chair/stool/bar
 	name = "bar stool"
@@ -375,7 +376,7 @@
 
 /obj/item/chair/stool/attack_self(mob/user as mob)
 	..()
-	origin.loc = get_turf(src)
+	new origin_type(get_turf(loc))
 	user.unEquip(src)
 	user.visible_message("<span class='notice'>[user] puts [src] down.</span>", "<span class='notice'>You put [src] down.</span>")
 	qdel(src)