Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff

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

@@ -197,18 +197,22 @@ update_label("John Doe", "Clowny")
 	registered_name = "Emergency Response Team Commander"
 	assignment = "Emergency Response Team Commander"
 	New() access = get_all_accesses()
+	New() access = list(access_cent_captain, access_cent_specops, access_cent_storage, access_cent_medical)
 
 /obj/item/weapon/card/id/ert/Security
 	registered_name = "Security Response Officer"
 	assignment = "Security Response Officer"
+	New() access = list(access_cent_specops)
 
 /obj/item/weapon/card/id/ert/Engineer
 	registered_name = "Engineer Response Officer"
 	assignment = "Engineer Response Officer"
+	New() access = list(access_cent_storage)
 
 /obj/item/weapon/card/id/ert/Medical
 	registered_name = "Medical Response Officer"
 	assignment = "Medical Response Officer"
+	New() access = list(access_cent_medical)
 
 /obj/item/weapon/card/id/prisoner
 	name = "prisoner ID card"

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

@@ -223,6 +223,7 @@
 	item_state = "duffle"
 	storage_slots = 9
 	slowdown = 1
+	max_combined_w_class = 27
 
 /obj/item/weapon/storage/backpack/dufflebag/syndiemed
 	name = "medical dufflebag"

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

@@ -601,4 +601,19 @@
 	new /obj/item/clothing/tie/armband/deputy(src)
 	new /obj/item/clothing/tie/armband/deputy(src)
 	new /obj/item/clothing/tie/armband/deputy(src)
-	new /obj/item/clothing/tie/armband/deputy(src)
+	new /obj/item/clothing/tie/armband/deputy(src)
+
+/obj/item/weapon/storage/box/metalfoam
+	name = "box of metal foam grenades"
+	desc = "To be used to rapidly seal hull breaches"
+	icon_state = "flashbang"
+
+/obj/item/weapon/storage/box/metalfoam/New()
+	..()
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
+	new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)

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

@@ -6,6 +6,7 @@
 	icon_closed = "critter"
 	var/already_opened = 0
 	var/content_mob = null
+	var/amount = 1
 
 /obj/structure/closet/critter/can_open()
 	if(locked || welded)
@@ -21,20 +22,7 @@
 		return ..()
 
 	if(content_mob != null && already_opened == 0)
-		if(content_mob == /mob/living/simple_animal/chick)
-			var/num = rand(1, 3)
-			for(var/i = 0, i < num, i++)
-				new content_mob(loc)
-		else if(content_mob == /mob/living/simple_animal/corgi)
-			var/num = rand(0, 1)
-			if(num) //No more matriarchy for cargo
-				content_mob = /mob/living/simple_animal/corgi/Lisa
-			new content_mob(loc)
-		else if(content_mob == /mob/living/simple_animal/cat)
-			if(prob(50))
-				content_mob = /mob/living/simple_animal/cat/Proc
-			new content_mob(loc)
-		else
+		for(var/i = 0, i <= amount, i++)
 			new content_mob(loc)
 		already_opened = 1
 	..()
@@ -56,7 +44,12 @@
 
 /obj/structure/closet/critter/corgi
 	name = "corgi crate"
-	content_mob = /mob/living/simple_animal/corgi //This statement is (not) false. See above.
+	content_mob = /mob/living/simple_animal/corgi
+
+/obj/structure/closet/critter/corgi/New()
+	if(prob(50))
+		content_mob = /mob/living/simple_animal/corgi/Lisa
+	..()
 
 /obj/structure/closet/critter/cow
 	name = "cow crate"
@@ -70,14 +63,28 @@
 	name = "chicken crate"
 	content_mob = /mob/living/simple_animal/chick
 
+/obj/structure/closet/critter/chick/New()
+	amount = rand(1, 3)
+	..()
+
 /obj/structure/closet/critter/cat
 	name = "cat crate"
 	content_mob = /mob/living/simple_animal/cat
 
+/obj/structure/closet/critter/cat/New()
+	if(prob(50))
+		content_mob = /mob/living/simple_animal/cat/Proc
+	..()
+
 /obj/structure/closet/critter/pug
 	name = "pug crate"
 	content_mob = /mob/living/simple_animal/pug
 
 /obj/structure/closet/critter/fox
 	name = "fox crate"
-	content_mob = /mob/living/simple_animal/fox
+	content_mob = /mob/living/simple_animal/fox
+
+/obj/structure/closet/critter/butterfly
+	name = "butterflies crate"
+	content_mob = /mob/living/simple_animal/butterfly
+	amount = 50

code/game/objects/structures/lattice.dm

@@ -100,6 +100,13 @@
 	T.cancable = 1
 	..()
 
+/obj/structure/lattice/catwalk/Move()
+	var/turf/T = loc
+	T.cancable = 0
+	for(var/obj/structure/cable/C in T)
+		C.Deconstruct()
+	..()
+
 /obj/structure/lattice/catwalk/Destroy()
 	var/turf/T = loc
 	T.cancable = 0
@@ -127,11 +134,8 @@
 	var/dir_sum = 0
 
 	for (var/direction in cardinal)
-		if(locate(/obj/structure/lattice/catwalk, get_step(src, direction)))
+		if(locate(/obj/structure/lattice/catwalk, get_step(src, direction))) //so we only blend with other catwalks
 			dir_sum += direction
-		else
-			if(!(istype(get_step(src, direction), /turf/space)))
-				dir_sum += direction
 
 	icon_state = "[name][dir_sum]"
 	return