Бафф атмостехов

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -312,3 +312,24 @@
 	beakers += B1
 	beakers += B2
 	icon_state = initial(icon_state) +"_locked"
+
+///////AFFF
+/obj/item/weapon/grenade/chem_grenade/afff
+	name = "afff grenade"
+	desc = ""
+	stage = 2
+	path = 1
+
+/obj/item/weapon/grenade/chem_grenade/afff/atom_init()
+	. = ..()
+	var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
+	var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+
+	B1.reagents.add_reagent("aqueous_foam", 60)
+	B2.reagents.add_reagent("aqueous_foam", 60)
+
+	detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
+
+	beakers += B1
+	beakers += B2
+	icon_state = initial(icon_state) +"_locked"

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

@@ -462,3 +462,26 @@
 		candy_overlays += image('icons/obj/valentines.dmi', "[candy_color][candy_position]")
 	add_overlay(candy_overlays)
 	return
+
+/obj/item/weapon/storage/fancy/atmos
+	name = "box of inflatable barriers"
+	desc = "Contains inflatable walls and doors."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "atmos_inflatable"
+	w_class = SIZE_SMALL
+	max_w_class = SIZE_SMALL
+	max_storage_space = DEFAULT_BACKPACK_STORAGE
+	storage_slots = 5
+	icon_type = "atmostech's inflatable wall"
+	can_hold = list(/obj/item/inflatable/atmos, /obj/item/inflatable/door/atmos)
+
+/obj/item/weapon/storage/fancy/atmos/atom_init()
+	. = ..()
+	for(var/i in 1 to 3)
+		new /obj/item/inflatable/atmos(src)
+	for(var/i in 1 to 2)
+		new /obj/item/inflatable/door/atmos(src)
+	update_icon()
+
+/obj/item/weapon/storage/fancy/atmos/update_icon()
+	icon_state = "[initial(icon_state)][contents.len]"

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

@@ -128,10 +128,11 @@
 
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/device/flashlight(src)
-	new /obj/item/weapon/reagent_containers/spray/extinguisher(src)
+	new /obj/item/weapon/reagent_containers/spray/extinguisher/atmo(src)
 	new /obj/item/device/radio/headset/headset_eng(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
 	new /obj/item/clothing/mask/gas/coloured(src)
 	new /obj/item/weapon/cartridge/atmos(src)
 	new /obj/item/taperoll/engineering(src)
 	new /obj/item/weapon/gun/energy/pyrometer/atmospherics(src)
+	new /obj/item/weapon/storage/fancy/atmos(src)

code/game/objects/structures/inflatable.dm

@@ -5,6 +5,7 @@
 	icon_state = "folded_wall"
 	w_class = SIZE_SMALL
 	var/inflatable_type = /obj/structure/inflatable
+	var/flate_time = 40
 
 /obj/item/inflatable/attack_self(mob/user)
 	if(user.is_busy()) return
@@ -13,7 +14,7 @@
 		"<span class='notice'>[user] starts inflating \the [src]...</span>",
 		"<span class='notice'>You start inflating \the [src]...</span>"
 	)
-	if(do_after(user, 40, target = user))
+	if(do_after(user, flate_time, target = user))
 		playsound(src, 'sound/items/zip.ogg', VOL_EFFECTS_MASTER)
 		user.visible_message(
 			"<span class='notice'>[user] inflated \the [src].</span>",
@@ -34,7 +35,10 @@
 	icon = 'icons/obj/inflatable.dmi'
 	icon_state = "wall"
 
+	var/inflatable_type = /obj/item/inflatable
+	var/torn_type = /obj/item/inflatable/torn
 	var/health = 50.0
+	var/deflate_time = 50
 
 
 /obj/structure/inflatable/atom_init()
@@ -133,14 +137,14 @@
 	playsound(src, 'sound/machines/hiss.ogg', VOL_EFFECTS_MASTER)
 	if(violent)
 		visible_message("[src] rapidly deflates!")
-		var/obj/item/inflatable/torn/R = new /obj/item/inflatable/torn(loc)
+		var/obj/item/inflatable/torn/R = new torn_type(loc)
 		transfer_fingerprints_to(R)
 		qdel(src)
 	else
 		//user << "<span class='notice'>You slowly deflate the inflatable wall.</span>"
 		visible_message("[src] slowly deflates.")
-		spawn(50)
-			var/obj/item/inflatable/R = new /obj/item/inflatable(loc)
+		spawn(deflate_time)
+			var/obj/item/inflatable/R = new inflatable_type(loc)
 			transfer_fingerprints_to(R)
 			qdel(src)
 
@@ -166,6 +170,8 @@
 	anchored = TRUE
 	opacity = 0
 
+	torn_type = /obj/item/inflatable/door/torn
+	inflatable_type = /obj/item/inflatable/door
 	icon = 'icons/obj/inflatable.dmi'
 	icon_state = "door_closed"
 	var/opening_state = "door_opening"
@@ -256,14 +262,14 @@
 	playsound(src, 'sound/machines/hiss.ogg', VOL_EFFECTS_MASTER)
 	if(violent)
 		visible_message("[src] rapidly deflates!")
-		var/obj/item/inflatable/door/torn/R = new /obj/item/inflatable/door/torn(loc)
+		var/obj/item/inflatable/door/torn/R = new torn_type(loc)
 		transfer_fingerprints_to(R)
 		qdel(src)
 	else
 		//user << "<span class='notice'>You slowly deflate the inflatable wall.</span>"
 		visible_message("[src] slowly deflates.")
-		spawn(50)
-			var/obj/item/inflatable/door/R = new /obj/item/inflatable/door(loc)
+		spawn(deflate_time)
+			var/obj/item/inflatable/door/R = new inflatable_type(loc)
 			transfer_fingerprints_to(R)
 			qdel(src)
 
@@ -300,3 +306,40 @@
 		new /obj/item/inflatable/door(src)
 	for (var/i in 1 to 4)
 		new /obj/item/inflatable(src)
+
+
+/obj/item/inflatable/atmos
+	name = "atmostech's inflatable wall"
+	icon_state = "folded_wall_atmo"
+	inflatable_type = /obj/structure/inflatable/atmos
+	flate_time = 20
+
+/obj/structure/inflatable/atmos
+	icon_state = "wall_atmo"
+	health = 80.0
+	deflate_time = 30
+	torn_type = /obj/item/inflatable/torn/atmos
+	inflatable_type = /obj/item/inflatable/atmos
+
+/obj/item/inflatable/door/atmos
+	name = "atmostech's inflatable door"
+	icon_state = "folded_door_atmo"
+	inflatable_type = /obj/structure/inflatable/door/atmos
+	flate_time = 20
+
+/obj/structure/inflatable/door/atmos
+	icon_state = "door_atmo_closed"
+	opening_state = "door_atmo_opening"
+	closing_state = "door_atmo_closing"
+	open_state = "door_atmo_open"
+	closed_state = "door_atmo_closed"
+	torn_type = /obj/item/inflatable/door/torn/atmos
+	inflatable_type = /obj/item/inflatable/door/atmos
+	health = 80.0
+	deflate_time = 30
+
+/obj/item/inflatable/torn/atmos
+	icon_state = "folded_wall_atmo_torn"
+
+/obj/item/inflatable/door/torn/atmos
+	icon_state = "folded_door_atmo_torn"

code/modules/clothing/suits/utility.dm

@@ -18,7 +18,7 @@
 	gas_transfer_coefficient = 0.90
 	permeability_coefficient = 0.50
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/extinguisher)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/reagent_containers/spray/extinguisher,/obj/item/clothing/mask/gas)
 	slowdown = 0.5
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
 	flags_pressure = STOPS_HIGHPRESSUREDMAGE

code/modules/reagents/reagent_containers/extinguisher.dm

@@ -110,3 +110,17 @@ ADD_TO_GLOBAL_LIST(/obj/item/weapon/reagent_containers/spray/extinguisher, extin
 	random_overlay = FALSE
 	reagent_inside = "champagne"
 	FE_type = "golden"
+
+/obj/item/weapon/reagent_containers/spray/extinguisher/atmo
+	name = "Compact fire extinguisher"
+	desc = "Compact fire extinguisher."
+	icon_state = "fire_extinguisher_atmo"
+	item_state = "fire_extinguisher_atmo"
+	throwforce = 10
+	force = 8
+	w_class = SIZE_TINY
+
+	volume = 300
+
+	random_overlay = FALSE
+	FE_type = "mini"