Коммиты из-под ёлки

SierraBay · Dec 31, 2023 · 714fcb6 · 714fcb6
1 parent eafe429
commit 714fcb6
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 8 deletions.
diff --git a/maps/sierra/icons/obj/suitstorage.dmi b/maps/sierra/icons/obj/suitstorage.dmi
diff --git a/maps/sierra/items/clothing/clothing.dm b/maps/sierra/items/clothing/clothing.dm
@@ -12,3 +12,49 @@
 		/obj/item/rig_module/maneuvering_jets,
 		/obj/item/rig_module/mounted/energy/taser
 		)
+
+/obj/item/clothing/suit/space/void/sapper
+	name = "\improper sapper voidsuit"
+	desc = "A specially produced heavy suit for sapper units on space facilities. Usually, uses as emergency spacesuit."
+	icon_state = "rig-secTG"
+	item_state = "rig-secTG"
+	icon = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi'
+	item_icons = list(slot_wear_suit_str = 'maps/sierra/icons/mob/onmob/onmob_suit.dmi')
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	armor = list(
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_SMALL,
+		laser = ARMOR_LASER_SMALL,
+		energy = ARMOR_ENERGY_RESISTANT,
+		bomb = ARMOR_BOMB_SHIELDED,
+		bio = ARMOR_BIO_SHIELDED,
+		rad = ARMOR_RAD_MINOR
+	)
+	flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDEGLOVES
+	siemens_coefficient = 0
+
+/obj/item/clothing/suit/space/void/sapper/New()
+	..()
+	slowdown_per_slot[slot_wear_suit] = 2
+
+/obj/item/clothing/head/helmet/space/void/sapper
+	name = "sapper voidsuit helmet"
+	desc = "A specially produced heavy helmet for sapper units on space facilities."
+	icon_state = "rig0-secTG"
+	item_state = "rig0-secTG"
+	item_icons = list(slot_head_str = 'maps/sierra/icons/mob/onmob/onmob_head.dmi')
+	armor = list(
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_SMALL,
+		laser = ARMOR_LASER_SMALL,
+		energy = ARMOR_ENERGY_RESISTANT,
+		bomb = ARMOR_BOMB_SHIELDED,
+		bio = ARMOR_BIO_SHIELDED,
+		rad = ARMOR_RAD_MINOR
+	)
+	item_state_slots = list(
+		slot_l_hand_str = "sec_helm",
+		slot_r_hand_str = "sec_helm",
+		)
+	siemens_coefficient = 0
+	light_overlay = "helmet_light_dual"
diff --git a/maps/sierra/machinery/machinery.dm b/maps/sierra/machinery/machinery.dm
@@ -49,18 +49,34 @@
 /obj/machinery/suit_cycler/pilot
 	req_access = list(access_explorer) //because unathi version of expeditonary suit it shit
 
-/obj/machinery/suit_storage_unit/security/Initialize()
-	. = ..()
+// Overrides
+
+/obj/machinery/suit_storage_unit/security
+	name = "security voidsuit storage unit"
+	suit= /obj/item/clothing/suit/space/void/security
+	helmet = /obj/item/clothing/head/helmet/space/void/security
+	boots = /obj/item/clothing/shoes/magboots
+	tank = /obj/item/tank/oxygen
+	mask = /obj/item/clothing/mask/breath
+	req_access = list(access_security)
+	islocked = 1
 	ssu_color = "#cc0000"
 
+/obj/machinery/suit_storage_unit/medical
+	name = "medical voidsuit storage unit"
+	suit= /obj/item/clothing/suit/space/void/medical
+	helmet = /obj/item/clothing/head/helmet/space/void/medical
+	boots = /obj/item/clothing/shoes/magboots
+	tank = /obj/item/tank/oxygen
+	mask = /obj/item/clothing/mask/breath
+	req_access = list(access_medical)
+	islocked = 1
+	ssu_color = "#55aaaa"
+
 /obj/machinery/suit_storage_unit/mining/Initialize()
 	. = ..()
 	ssu_color = "#b88a3b"
 
-/obj/machinery/suit_storage_unit/medical/Initialize()
-	. = ..()
-	ssu_color = "#55aaaa"
-
 /obj/machinery/suit_storage_unit/engineering/Initialize()
 	. = ..()
 	ssu_color = "#ffbf00"
@@ -73,6 +89,12 @@
 	. = ..()
 	ssu_color =	"#990000"
 
+/obj/machinery/suit_storage_unit/security/sapper
+	name = "Sapper Voidsuit Storage Unit"
+	suit = /obj/item/clothing/suit/space/void/sapper
+	helmet = /obj/item/clothing/head/helmet/space/void/sapper
+	ssu_color = "#54654c"
+
 /obj/machinery/suit_storage_unit/explorer
 	name = "Exploration Voidsuit Storage Unit"
 	suit = /obj/item/clothing/suit/space/void/exploration

diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm
@@ -50496,7 +50496,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/closet/bombclosetsecurity,
+/obj/machinery/suit_storage_unit/security/sapper,
 /turf/simulated/floor/tiled/techfloor,
 /area/security/sierra/suits)
 "hzb" = (
@@ -61139,6 +61139,10 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/item/clothing/suit/bio_suit/security,
+/obj/item/clothing/head/bio_hood/security,
+/obj/item/clothing/mask/gas/half,
+/obj/item/tank/oxygen_emergency_extended,
 /turf/simulated/floor/tiled/techfloor,
 /area/security/sierra/suits)
 "jfA" = (
@@ -96914,6 +96918,10 @@
 	dir = 4;
 	pixel_x = -24
 	},
+/obj/item/clothing/suit/bio_suit/security,
+/obj/item/clothing/head/bio_hood/security,
+/obj/item/clothing/mask/gas/half,
+/obj/item/tank/oxygen_emergency_extended,
 /turf/simulated/floor/tiled/techfloor,
 /area/security/sierra/suits)
 "oAk" = (
@@ -135024,7 +135032,6 @@
 /turf/simulated/floor/tiled,
 /area/security/sierra/prison)
 "uiv" = (
-/obj/structure/closet/l3closet/security,
 /obj/machinery/power/apc{
 	dir = 1;
 	name = "north bump";
@@ -135037,6 +135044,7 @@
 /obj/structure/sign/poster{
 	pixel_x = -32
 	},
+/obj/structure/closet/bombclosetsecurity,
 /turf/simulated/floor/tiled/techfloor,
 /area/security/sierra/suits)
 "uiA" = (