From 360c17757e7b4622ba289b876eef22678dca54cb Mon Sep 17 00:00:00 2001
From: XoMkA-BY <155300656+XoMkA-BY@users.noreply.github.com>
Date: Sat, 28 Dec 2024 13:26:43 +0300
Subject: [PATCH] ADD: Faction & independent survival boxes (#1303)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* сурвивал бокс апдейт 1

* уродский респрайт независимой коробки + чистка мусорных спрайтов

---------

Signed-off-by: XoMkA-BY <155300656+XoMkA-BY@users.noreply.github.com>
---
 .../_storge_icons/icons/survival_boxes.dmi    | Bin 0 -> 776 bytes
 mod_celadon/items/_items.dme                  |   1 +
 mod_celadon/items/code/boxes.dm               | 116 +++++++++++++++++-
 .../code/elysium/outfit_ship/elysium.dm       |   6 +
 .../independent/outfit_ship/independent.dm    |  55 +++++++++
 mod_celadon/outfit/code/inteq/inteq_outfit.dm |   4 +
 .../outfit/code/nanotrasen/nt_outfit.dm       |  55 ++++++++-
 .../outfit/code/solfed/solfed_outfit.dm       |  19 +++
 .../outfit/code/syndicate/syndi_outfit.dm     |  43 +++++++
 9 files changed, 288 insertions(+), 11 deletions(-)
 create mode 100644 mod_celadon/_storge_icons/icons/survival_boxes.dmi

diff --git a/mod_celadon/_storge_icons/icons/survival_boxes.dmi b/mod_celadon/_storge_icons/icons/survival_boxes.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..0c886d75f3d9a3eaf92ddab61f5b3d79c7a22e40
GIT binary patch
literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq003YB002M;0{{R3(&~ad0001fP)t-sz`($X
zGBRQ>Csk;RsVXXw6%|n=9Z4M)N?d(9OKGV`M`txHV|JNaC?IqtB}`j(yPJDoZ;iyA
zo!Gv<;JA>Tsm#{k|M8nK|I9Q0|Np^gATuy9z`(#iM{m@C06j^9C^mGsZvakPo#KfC
zJ3?c@)&JV&|F^fd+1c4zTGc$>V(9<?00DGTPE!Ct=GbNc00518R9JLGWpiV4X>fFD
zZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w
z;*!LYR3K9+DZe7VxU{G&vn(+uzPK_^iHkEOv#1y-Wyr;uR+N~V3Snc{kXcBY`r`Z?
z(lq3i#3$yIkm#tq6kHmV6<qyXz~KY{Jj-2CyomCv0004>Nkl<ZScUDD+m3=T5I|Lw
zx;KGhK{O(`T;%_MaHrsAnamWkbxlmRM?xRQ^pv?Ioy{B$#}9J^jV};1?je}{m#Yy=
zVp#ZMgij3K`enqL8l2!61PDfeU<3$8@QR><Hv|>DBN)MadJq;L2rBSy48jJdXhQ|#
z4`2iVf)i{2U0}Vkf-nqqfni|<`rHwqS6(1xtPdYc$qM{%yWI)_uh3@&N+mr?@q(3%
zK@bCSWfG)9q$WY6f?$_ryC6^zFNn3EH<$$JUWk2a5+vV(#4NZP?7kogGA+oA0y!9_
zQZ!YANM(Z{Go<KNk#Ba<bde9ZO%EiF=YYm>o02&E1M&B9hr{9c9~==ho+B*wKNTZR
z#E_SW-y59Z83c$22+jy9_(WI;j?;sX=XVZ5RUj%NfV9BL%TgcTCPh_I0XqG9<pi+t
z74TRI>bmKvYhKW{m!7t@6F{FfMWdhk#0m25(p})`x;D2Hz}|zSF$%N;ezt<<swm7~
z(A^`bn;}KTgHrV1A|G&@())ke4{+b4(54pmb9euD*zyHIZ*k6nZ}HFo0000<MNUMn
GLSTaX09S$l

literal 0
HcmV?d00001

diff --git a/mod_celadon/items/_items.dme b/mod_celadon/items/_items.dme
index 8640dac182be..72b0aa571e3e 100644
--- a/mod_celadon/items/_items.dme
+++ b/mod_celadon/items/_items.dme
@@ -33,5 +33,6 @@
 #include "code/toggles.dm"
 #include "code/under.dm"
 #include "code/weapons.dm"
+#include "code/boxes.dm"
 
 #endif
diff --git a/mod_celadon/items/code/boxes.dm b/mod_celadon/items/code/boxes.dm
index 1c97480497a4..1353879eabdf 100644
--- a/mod_celadon/items/code/boxes.dm
+++ b/mod_celadon/items/code/boxes.dm
@@ -1,6 +1,110 @@
-	// NTAS/ERT special survival box
-/obj/item/storage/box/survival/ntert
-	mask_type = /obj/item/clothing/mask/gas/sechailer
-	internal_type = /obj/item/tank/internals/emergency_oxygen/double
-	medipen_type = /obj/item/reagent_containers/hypospray/medipen
-	radio_type = /obj/item/radio
+
+			// nanotrasen survival box
+/obj/item/storage/box/survival/nanotrasen
+	name = "nanotrasen survival box"
+	icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
+	icon_state = "box_survival_nt_alt"
+	mask_type = null
+	internal_type = null
+	medipen_type = null
+	radio_type = null
+/obj/item/storage/box/survival/nanotrasen/PopulateContents()
+	var/static/items_inside = list(
+		/obj/item/clothing/mask/breath = 1,\
+		/obj/item/tank/internals/emergency_oxygen/engi = 1,\
+		/obj/item/reagent_containers/hypospray/medipen = 1,\
+		/obj/item/reagent_containers/pill/penacid = 1,\
+		/obj/item/reagent_containers/food/snacks/ration = 1,\
+		/obj/item/radio = 1,\
+		/obj/item/crowbar = 1,\
+		)
+	generate_items_inside(items_inside,src)
+
+
+			// syndicate survival box
+/obj/item/storage/box/survival/syndicate
+	name = "syndicate survival box"
+	icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
+	icon_state = "box_survival_syn"
+	mask_type = null
+	internal_type = null
+	medipen_type = null
+	radio_type = null
+/obj/item/storage/box/survival/syndicate/PopulateContents()
+	var/static/items_inside = list(
+		/obj/item/clothing/mask/gas/syndicate = 1,\
+		/obj/item/tank/internals/emergency_oxygen/engi = 1,\
+		/obj/item/reagent_containers/hypospray/medipen/atropine = 1,\
+		/obj/item/reagent_containers/pill/penacid = 1,\
+		/obj/item/reagent_containers/food/snacks/donkpocket/warm = 1,\
+		/obj/item/radio = 1,\
+		/obj/item/crowbar/syndie = 1,\
+		)
+	generate_items_inside(items_inside,src)
+
+
+			// inteq survival box
+/obj/item/storage/box/survival/inteq
+	name = "inteq survival box"
+	icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
+	icon_state = "box_survival_iq"
+	mask_type = null
+	internal_type = null
+	medipen_type = null
+	radio_type = null
+/obj/item/storage/box/survival/inteq/PopulateContents()
+	var/static/items_inside = list(
+		/obj/item/clothing/mask/gas/sechailer/balaclava/inteq = 1,\
+		/obj/item/tank/internals/emergency_oxygen/engi = 1,\
+		/obj/item/reagent_containers/hypospray/medipen/atropine = 1,\
+		/obj/item/reagent_containers/pill/penacid = 1,\
+		/obj/item/reagent_containers/food/snacks/rationpack = 1,\
+		/obj/item/radio = 1,\
+		/obj/item/crowbar/red = 1,\
+		)
+	generate_items_inside(items_inside,src)
+
+
+			// solfed survival box
+/obj/item/storage/box/survival/solfed
+	name = "solfed survival box"
+	icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
+	icon_state = "box_survival_sol"
+	mask_type = null
+	internal_type = null
+	medipen_type = null
+	radio_type = null
+/obj/item/storage/box/survival/solfed/PopulateContents()
+	var/static/items_inside = list(
+		/obj/item/clothing/mask/breath = 1,\
+		/obj/item/tank/internals/emergency_oxygen/engi = 1,\
+		/obj/item/reagent_containers/hypospray/medipen = 1,\
+		/obj/item/reagent_containers/pill/penacid = 1,\
+		/obj/item/reagent_containers/food/snacks/ration = 1,\
+		/obj/item/radio = 1,\
+		/obj/item/crowbar = 1,\
+		)
+	generate_items_inside(items_inside,src)
+
+
+			// independent & elisium survival box
+/obj/item/storage/box/survival/independent
+	name = "mass-produced survival box"
+	icon = 'mod_celadon/_storge_icons/icons/survival_boxes.dmi'
+	icon_state = "box_survival_ind"
+	mask_type = null
+	internal_type = null
+	medipen_type = null
+	radio_type = null
+/obj/item/storage/box/survival/independent/PopulateContents()
+	var/static/items_inside = list(
+		/obj/item/clothing/mask/breath = 1,\
+		/obj/item/tank/internals/emergency_oxygen = 1,\
+		/obj/item/reagent_containers/hypospray/medipen = 1,\
+		/obj/item/reagent_containers/pill/charcoal = 1,\
+		/obj/item/reagent_containers/food/snacks/ration/bar = 1,\
+		/obj/item/flashlight/flare = 1,\
+		/obj/item/radio = 1,\
+		)
+	generate_items_inside(items_inside,src)
+
diff --git a/mod_celadon/outfit/code/elysium/outfit_ship/elysium.dm b/mod_celadon/outfit/code/elysium/outfit_ship/elysium.dm
index 68094914f951..2639593287dc 100644
--- a/mod_celadon/outfit/code/elysium/outfit_ship/elysium.dm
+++ b/mod_celadon/outfit/code/elysium/outfit_ship/elysium.dm
@@ -1,3 +1,9 @@
+//hopefully дает всему элизиуму коробки для выживания ИСВ(бомжей)
+
+/datum/outfit/job/elysium
+	box = /obj/item/storage/box/survival/independent
+
+
 /obj/item/card/id/elysium
 	desc = "A Elysium ID with no proper access to speak of."
 	icon = 'mod_celadon/_storge_icons/icons/obj/elysium_card.dmi'
diff --git a/mod_celadon/outfit/code/independent/outfit_ship/independent.dm b/mod_celadon/outfit/code/independent/outfit_ship/independent.dm
index 52c2edfa1b71..9d96fb75d50e 100644
--- a/mod_celadon/outfit/code/independent/outfit_ship/independent.dm
+++ b/mod_celadon/outfit/code/independent/outfit_ship/independent.dm
@@ -1,3 +1,58 @@
+//дает всем трупам из легионов(я надеюсь что всем) коробки для выживания исв
+/datum/outfit/generic
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/generic/security
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/generic/miner
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/generic/doctor
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/generic/engineer
+	box = /obj/item/storage/box/survival/independent
+
+
+
+//дает всем нефракционышам коробку для выживания исв
+/datum/outfit/job/independent
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/ert/technician
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/chemist
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/ce
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/cmo
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/engineer
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/hos
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/doctor
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/miner
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/paramedic
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/security
+	box = /obj/item/storage/box/survival/independent
+
+/datum/outfit/job/independent/warden
+	box = /obj/item/storage/box/survival/independent
+
 /datum/outfit/job/independent/assistant/fancy/lagoon
 	name = "Independent - Fancy (Formal Uniform)"
 
diff --git a/mod_celadon/outfit/code/inteq/inteq_outfit.dm b/mod_celadon/outfit/code/inteq/inteq_outfit.dm
index 6f882027de7e..0ca1e69b8f3f 100644
--- a/mod_celadon/outfit/code/inteq/inteq_outfit.dm
+++ b/mod_celadon/outfit/code/inteq/inteq_outfit.dm
@@ -71,6 +71,10 @@
 	. = ..()
 	get_inteq_g_acces(H)
 
+	// Даёт всем интекашкам брендовый сурвивал бокс
+/datum/outfit/job/inteq
+	box = /obj/item/storage/box/survival/inteq
+
 //Капитан
 
 /datum/outfit/job/inteq/captain/celadon
diff --git a/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm b/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm
index c856e511e5a5..52e6a6558db9 100644
--- a/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm
+++ b/mod_celadon/outfit/code/nanotrasen/nt_outfit.dm
@@ -22,7 +22,45 @@
 /datum/outfit/job/nanotrasen/post_equip(mob/living/carbon/human/H)
 	. = ..()
 	get_nt_general_access(H)
+// Даёт всем НТшкам брендовый сурвивал бокс
+/datum/outfit/job/nanotrasen
+	box = /obj/item/storage/box/survival/nanotrasen
 
+/datum/outfit/job/nanotrasen/hos
+	box = /obj/item/storage/box/survival/nanotrasen
+	
+/datum/outfit/job/nanotrasen/engineer
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/security
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/paramedic
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/doctor
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/cmo
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/warden
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/ce
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/atmos
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/miner
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/doctor/lp
+	box = /obj/item/storage/box/survival/nanotrasen
+
+/datum/outfit/job/nanotrasen/chemist
+	box = /obj/item/storage/box/survival/nanotrasen
 // Научный директор - РД
 
 /datum/outfit/job/nanotrasen/rd
@@ -214,7 +252,8 @@
 	id = /obj/item/card/id/ert
 	ears = /obj/item/radio/headset/nanotrasen/alt/captain
 	backpack_contents = list(/obj/item/radio)
-	box = /obj/item/storage/box/survival/ntert
+	box = /obj/item/storage/box/survival/nanotrasen
+
 
 	//Nanotrasen Tactical Assault Team сбуха
 
@@ -230,7 +269,8 @@
 	id = /obj/item/card/id/ert/security
 	ears = /obj/item/radio/headset/nanotrasen/alt
 	backpack_contents = list(/obj/item/radio)
-	box = /obj/item/storage/box/survival/ntert
+
+	box = /obj/item/storage/box/survival/nanotrasen
 
 	//Nanotrasen Tactical Assault Team медик
 
@@ -246,7 +286,9 @@
 	id = /obj/item/card/id/ert/medical
 	ears = /obj/item/radio/headset/nanotrasen/alt
 	backpack_contents = list(/obj/item/radio)
-	box = /obj/item/storage/box/survival/ntert
+
+	box = /obj/item/storage/box/survival/nanotrasen
+
 
 	//Nanotrasen Tactical Assault Team инженер
 
@@ -262,7 +304,8 @@
 	id = /obj/item/card/id/ert/engineer
 	ears = /obj/item/radio/headset/nanotrasen/alt
 	backpack_contents = list(/obj/item/radio)
-	box = /obj/item/storage/box/survival/ntert
+  
+	box = /obj/item/storage/box/survival/nanotrasen
 
 	//Nanotrasen Tactical Assault Team уборщичек
 
@@ -278,4 +321,6 @@
 	id = /obj/item/card/id/ert/janitor
 	ears = /obj/item/radio/headset/nanotrasen/alt
 	backpack_contents = list(/obj/item/radio)
-	box = /obj/item/storage/box/survival/ntert
+
+	box = /obj/item/storage/box/survival/nanotrasen
+
diff --git a/mod_celadon/outfit/code/solfed/solfed_outfit.dm b/mod_celadon/outfit/code/solfed/solfed_outfit.dm
index f6b828f6a288..debece27d580 100644
--- a/mod_celadon/outfit/code/solfed/solfed_outfit.dm
+++ b/mod_celadon/outfit/code/solfed/solfed_outfit.dm
@@ -103,6 +103,25 @@
 	. = ..()
 	get_solfed_general_access(H)
 
+	// Даёт всем СФкам брендовый сурвивал бокс
+/datum/outfit/job/solgov
+	box = /obj/item/storage/box/survival/solfed
+
+/datum/outfit/job/solgov/ert/inspector
+	box = /obj/item/storage/box/survival/solfed
+
+/datum/outfit/job/solgov/sonnensoldner
+	box = /obj/item/storage/box/survival/solfed
+
+/datum/outfit/job/solgov/engineer
+	box = /obj/item/storage/box/survival/solfed
+
+/datum/outfit/job/solgov/doctor
+	box = /obj/item/storage/box/survival/solfed
+
+/datum/outfit/job/solgov/miner
+	box = /obj/item/storage/box/survival/solfed
+
 // Ученые
 /datum/outfit/job/solgov/scientist
 	name = "SolGov - Scientific Officer"
diff --git a/mod_celadon/outfit/code/syndicate/syndi_outfit.dm b/mod_celadon/outfit/code/syndicate/syndi_outfit.dm
index 55cf39f315e7..1f7f82a14964 100644
--- a/mod_celadon/outfit/code/syndicate/syndi_outfit.dm
+++ b/mod_celadon/outfit/code/syndicate/syndi_outfit.dm
@@ -23,6 +23,49 @@
 	. = ..()
 	get_syndi_general_access(H)
 
+	// Даёт всем синдешкам брендовый сурвивал бокс
+/datum/outfit/job/syndicate
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/atmos
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/chemist
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/ce
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/engineer
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/miner
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/miner/twink
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/paramedic
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/doctor
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/cmo
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/security
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/hos
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/assistant
+	box = /obj/item/storage/box/survival/syndicate
+
+/datum/outfit/job/syndicate/assistant/suns
+	box = /obj/item/storage/box/survival/syndicate
+
 /datum/outfit/job/syndicate/science/cybersun
     name = "Syndicate - Scientist"
     jobtype = /datum/job/scientist