Unique survivors

cmss13-devs · Jun 21, 2023 · 3affa8f · 3affa8f
1 parent 8376cf0
commit 3affa8f
Show file tree

Hide file tree

Showing 4 changed files with 2,076 additions and 882 deletions.
diff --git a/code/game/machinery/storm_siren.dm b/code/game/machinery/storm_siren.dm
@@ -1,6 +1,6 @@
 /obj/structure/machinery/storm_siren
-	name = "Storm Siren"
-	desc = "A siren used to play storm warnings for the colony."
+	name = "storm siren"
+	desc = "A siren used to announce storm warnings for the colony."
 	icon = 'icons/obj/structures/machinery/loudspeaker.dmi'
 	icon_state = "loudspeaker"
 	density = FALSE
@@ -23,4 +23,4 @@
 
 /obj/structure/machinery/storm_siren/proc/weather_warning()
 	playsound(loc, 'sound/effects/weather_warning_varadero.ogg', 75, 0)
-	visible_message(SPAN_DANGER("The [src] blares. ATTENTION. INCOMING TROPICAL STORM DETECTED. SEEK SHELTER IMMEDIATELY."))
+	visible_message(SPAN_DANGER("The [src] blares: ATTENTION. ATTENTION. INCOMING TROPICAL STORM DETECTED. SEEK SHELTER IMMEDIATELY."))
diff --git a/code/modules/gear_presets/survivors.dm b/code/modules/gear_presets/survivors.dm
@@ -144,6 +144,21 @@
 
 	..()
 
+/datum/equipment_preset/survivor/scientist/nv
+	name = "Survivor - New Varadero Researcher"
+	assignment = "New Varadero Researcher"
+
+/datum/equipment_preset/survivor/scientist/nv/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/purple(new_human), WEAR_FEET)
+
+	..()
+
 /datum/equipment_preset/survivor/scientist/solaris
 	name = "Survivor - Solaris Scientist"
 	assignment = "Solaris Scientist"
@@ -266,6 +281,18 @@
 
 	..()
 
+/datum/equipment_preset/survivor/doctor/nv
+	name = "Survivor - New Varadero Medical Technician"
+	assignment = "New Varadero Medical Technician"
+
+/datum/equipment_preset/survivor/doctor/nv/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human.back), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD)
+
+	..()
+
 /datum/equipment_preset/survivor/doctor/solaris
 	name = "Survivor - Solaris Doctor"
 	assignment = "Solaris Doctor"
@@ -660,6 +687,18 @@
 
 	..()
 
+/datum/equipment_preset/survivor/chaplain/nv
+	name = "Survivor - New Varadero Priest"
+	assignment = "New Varadero Priest"
+
+/datum/equipment_preset/survivor/chaplain/nv/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/priest_robe(new_human), WEAR_JACKET)
+
+	..()
+
 /datum/equipment_preset/survivor/chaplain/solaris
 	name = "Survivor - Solaris Chaplain"
 	assignment = "Solaris Chaplain"
@@ -724,6 +763,19 @@
 
 	..()
 
+/datum/equipment_preset/survivor/engineer/nv
+	name = "Survivor - New Varadero Technician"
+	assignment = "New Varadero Engineer"
+
+/datum/equipment_preset/survivor/engineer/nv/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/dispatch(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD)
+
+	..()
+
 /datum/equipment_preset/survivor/engineer/shiva
 	name = "Survivor - Shivas Snowball Engineer"
 	assignment = "Shivas Snowball Engineer"
@@ -833,6 +885,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/tool/pickaxe(new_human.back), WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD)
 	add_survivor_weapon_civilian(new_human)
 
 	..()
@@ -896,6 +949,18 @@
 
 	..()
 
+/datum/equipment_preset/survivor/trucker/nv
+	name = "Survivor - New Varadero Vehicle Operator"
+	assignment = "New Varadero Vehicle Operator"
+
+/datum/equipment_preset/survivor/trucker/nv/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(new_human), WEAR_EYES)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
+
+	..()
 /datum/equipment_preset/survivor/trucker/kutjevo
 	name = "Survivor - Kutjevo Heavy Vehicle Operator"
 	assignment = "Kutjevo Heavy Vehicle Operator"
@@ -1079,6 +1144,20 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
 
+	..()
+
+/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv
+	name = "Survivor - Interstellar Commerce Commission Liaison New Varadero"
+	assignment = "Interstellar Commerce Commission Corporate Liaison"
+
+/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_L_HAND)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES)
+
 
 
 	..()
@@ -1107,6 +1186,32 @@
 
 	..()
 
+// ----- Bum Survivor
+
+/datum/equipment_preset/survivor/beachbum
+	name = "Survivor - Beach Bum"
+	assignment = "Beach Bum"
+	skills = /datum/skills/civilian/survivor/prisoner
+	flags = EQUIPMENT_PRESET_START_OF_ROUND
+	access = list(ACCESS_CIVILIAN_PUBLIC)
+
+/datum/equipment_preset/survivor/beachbum/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/shorts/red(new_human), WEAR_BODY)
+	if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
+		add_ice_colony_survivor_equipment(new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette(new_human), WEAR_FACE)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/botanic_leather(new_human), WEAR_HANDS)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/beer_pack(new_human.back), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife/butcher(new_human.back), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/wypacket(new_human.back), WEAR_IN_BACK)
+	add_survivor_weapon_civilian(new_human)
+
+	..()
+
+
 // ----- Interstellar Human Rights Survivor
 
 /datum/equipment_preset/survivor/interstellar_human_rights_observer