Merge branch 'CeladonSS13:beta-dev' into beta-dev

_maps/_mod_celadon/map_catalogue.txt

@@ -237,3 +237,7 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
 		File name = "_maps\RandomRuins\wasteruins\wasteplanet_abandoned_mechbay.dmm"
 		Size = (x = 45)(y = 47)(z = 1)
 		Tags = "Boss Combat Challenge", "Medium Loot", "Shelter", "Hazardous"
+
+		File name = "_maps\_mod_celadon\RandomRuins\WasteRuins\wasteplanet_claw_ruin.dmm"
+		Size = (x = 69)(y = 50)(z = 1)
+		Tags = "Boss Combat Challenge", "Rare Loot", "Shelter", "Hazardous"

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -268,6 +268,11 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythreeXnineteen, 4), \
 	new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythreeXtwentythree, 5), \
 	new/datum/stack_recipe("punching bag", /obj/structure/punching_bag, 5, time = 25, one_per_turf = TRUE, on_floor = TRUE), \
+	// [CELADON-ADD] - CELADON_QOL - добавляем рецепты обмоток лап
+	new/datum/stack_recipe("footwraps white", /obj/item/clothing/shoes/footwraps, 2), \
+	new/datum/stack_recipe("footwraps black", /obj/item/clothing/shoes/footwraps/black, 2), \
+	new/datum/stack_recipe("footwraps brown", /obj/item/clothing/shoes/footwraps/brown, 2), \
+	// [/CELADON-ADD]
 	))
 
 /obj/item/stack/sheet/cotton/cloth

mod_celadon/areas/code/ruin.dm

@@ -73,3 +73,23 @@
 /area/ruin/space/has_grav/ancientstation/hivebot
 	name = "Hivebot Mothership"
 	icon_state = "xenocell1"
+
+/area/ruin/wasteplanet/secure_claw
+	name = "Laboratory"
+	icon_state = "toxlab"
+
+/area/ruin/wasteplanet/secure_claw/contain
+	name = "Contain area"
+	icon_state = "syndie-control"
+
+/area/ruin/wasteplanet/secure_claw/engineering
+	name = "Engineering area"
+	icon_state = "yellow"
+
+/area/ruin/wasteplanet/secure_claw/control
+	name = "Secure Control area"
+	icon_state = "security"
+
+/area/ruin/wasteplanet/secure_claw/dorm
+	name = "Recreation area"
+	icon_state = "yellow"

mod_celadon/balance/code/hostile_mobs.dm

@@ -834,13 +834,12 @@ GLOBAL_LIST_INIT(onecardinalwest, WEST)
 
 /mob/living/simple_animal/hostile/megafauna/claw
 	armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 60, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
-	crusher_loot = list(/obj/item/card/id/ert/deathsquad,
-						/obj/item/documents/nanotrasen)
+	crusher_loot = list(/obj/item/light_eater)
 
 /mob/living/simple_animal/hostile/megafauna/claw/phase2 //75% of the health this thing has is here
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
-	crusher_loot = list(/obj/effect/spawner/clawloot)
-	loot = list(/obj/effect/spawner/clawloot/crusher)
+	crusher_loot = list(/obj/structure/closet/crate/necropolis/claw_phase_2)
+	loot = list(/obj/structure/closet/crate/necropolis/claw_phase_2)
 
 /mob/living/simple_animal/hostile/megafauna/colossus
 	armor = list("melee" = 0, "bullet" = 30, "laser" = 30, "energy" = 100, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 100, "acid" = 20)

mod_celadon/crusher_trophy/code/megafuna.dm

@@ -1,6 +1,4 @@
-/obj/effect/spawner/clawloot/crusher/spawn_loot()
-	new /obj/item/nullrod/tribal_knife(get_turf(src)) //idk what to put here, memed is the loot person // Заменено с армблейда на ритуальный нож
-	return ..()
+
 
 /mob/living/simple_animal/hostile/megafauna/cult_templar // Офы выпилили курсед клэймор
 	crusher_loot = list(/obj/item/melee/sword/claymore, /obj/item/clothing/suit/space/hardsuit/cult/enchanted, /obj/item/upgradescroll)

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

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)
+

mod_celadon/maps/code/ruins/ruin.dm

@@ -632,6 +632,12 @@
 	id = "crash_abductor_ship"
 	suffix = "wasteplanet_ruined_abductor_ship.dmm"
 
+/datum/map_template/ruin/wasteplanet/abondoned_containment
+	name = "Abandoned containment area"
+	description = "A containment zone that contains an unknown creature called 'Claws'. For some unknown reason, there is a crashed ship called 'Dareсt' near the containment zone."
+	id = "claw_waste"
+	suffix = "wasteplanet_claw_ruin.dmm"
+
 //							///
 //		Whitesand ruin		///
 //							///

mod_celadon/mobs/_mobs.dme

@@ -40,5 +40,6 @@
 #include "code/simple_animal/tele.dm"
 #include "code/simple_animal/plasma_legion.dm"
 #include "code/simple_animal/dragon.dm"
+#include "code/simple_animal/clawloot.dm"
 
 #endif

mod_celadon/mobs/code/simple_animal/clawloot.dm

@@ -0,0 +1,5 @@
+/obj/structure/closet/crate/necropolis/claw_phase_2
+	name = "Claw Chest"
+
+/obj/structure/closet/crate/necropolis/claw_phase_2/PopulateContents()
+	new /obj/item/minigunpack(src)

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'

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)"
 

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

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
+