map changes, goon corpses and the start of adding survivors

code/game/area/LV759_Hybrisa_Prospera.dm

@@ -889,7 +889,7 @@
 	ambience_exterior = AMBIENCE_LAB
 	soundscape_playlist = SCAPE_PL_LV759_INDOORS
 /area/lv759/indoors/wy_research_complex/hallwaynorth
-	name = "Weyland-Yutani - Advanced Bio-Genomic Research Complex - Technology Research & Development Lab"
+	name = "Weyland-Yutani - Advanced Bio-Genomic Research Complex - North Hallway"
 	icon_state = "wylab"
 	ambience_exterior = AMBIENCE_LAB_HALLWAY
 	soundscape_playlist = SCAPE_PL_LV759_INDOORS

code/game/objects/effects/landmarks/corpsespawner.dm

@@ -88,6 +88,24 @@
 	name = "Burst Weyland-Yutani Corporate Security Lead"
 	equip_path = /datum/equipment_preset/corpse/pmc/goon/lead/burst
 
+// Hybrisa - Goons
+
+/obj/effect/landmark/corpsespawner/hybrisa_goon
+	name = "Weyland-Yutani Corporate Security Officer"
+	equip_path = /datum/equipment_preset/corpse/pmc/hybrisa_goon
+
+/obj/effect/landmark/corpsespawner/hybrisa_goon/burst
+	name = "Burst Weyland-Yutani Corporate Security Officer"
+	equip_path = /datum/equipment_preset/corpse/pmc/hybrisa_goon/lead/burst
+
+/obj/effect/landmark/corpsespawner/hybrisa_goon/lead
+	name = "Weyland-Yutani Corporate Security Lead"
+	equip_path = /datum/equipment_preset/corpse/pmc/hybrisa_goon/lead
+
+/obj/effect/landmark/corpsespawner/hybrisa_goon/lead/burst
+	name = "Burst Weyland-Yutani Corporate Security Lead"
+	equip_path = /datum/equipment_preset/corpse/pmc/hybrisa_goon/lead/burst
+
 ///CM specific jobs///
 
 /obj/effect/landmark/corpsespawner/colonist //default is a colonist

code/game/objects/structures/hybrisa_props.dm

@@ -1108,7 +1108,7 @@
 	name = "fire"
 	icon = 'icons/obj/structures/props/64x96-hybrisarandomprops.dmi'
 	icon_state = "zfire_smoke"
-	layer = 5
+	layer = ABOVE_MOB_LAYER
 	light_on = TRUE
 	light_power = 2
 	light_range = 3
@@ -1121,10 +1121,27 @@
 
 /obj/structure/prop/hybrisa/misc/fire/firebarrel
 	name = "barrel"
+	icon = 'icons/obj/structures/props/64x64_hybrisarandomprops.dmi'
 	icon_state = "zbarrelfireon"
+	bound_height = 32
+	bound_width = 32
+	density = TRUE
+
+/obj/structure/prop/hybrisa/misc/firebarreloff
+	name = "barrel"
+	icon = 'icons/obj/structures/props/hybrisarandomprops.dmi'
+	icon_state = "zfirebarreloff"
+	bound_height = 32
+	bound_width = 32
+	density = TRUE
 
 // Misc
 
+/obj/structure/prop/hybrisa/misc/picture
+	name = "framed picture"
+	desc = "A golden framed picture of an ominous skeletal figure ordorned in golden garb, fancy for a pile of bones..."
+	icon_state = "pictureframe"
+
 /obj/structure/prop/hybrisa/misc/commandosuitemptyprop
 	name = "Weyland-Yutani 'Ape-Suit' Showcase"
 	desc = "A display model of the Weyland-Yutani 'Apesuit', shame it's only a model..."
@@ -1151,10 +1168,6 @@
 	name = "meter"
 	icon_state = "redmeter"
 
-/obj/structure/prop/hybrisa/misc/firebarreloff
-	name = "barrel"
-	icon_state = "zfirebarreloff"
-
 /obj/structure/prop/hybrisa/misc/trashbagfullprop
 	name = "trash bag"
 	icon_state = "ztrashbag"

code/modules/clothing/head/helmet.dm

@@ -1068,6 +1068,28 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	icon_state = "lead_helmet"
 	item_state = "lead_helmet"
 
+// HYBRISA - GOONS
+
+/obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa
+	name = "\improper WY corporate security helmet"
+	desc = "A basic skull-helm with a orange saftey vison fitted. Worn by corporate security assets, graded to protect your head from an unruly scientist armed with a crowbar."
+	icon = 'icons/mob/humans/onmob/contained/hybrisa_goons.dmi'
+	icon_state = "helmet_black"
+	item_state = "helmet_black"
+	contained_sprite = TRUE
+
+/obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa/lead
+	desc = "A basic skull-helm with a orange saftey vison fitted. Worn by corporate security assets. This variant is worn by low-level guards that have too much brainmatter to fit into the old one. Or so they say."
+	icon_state = "lead_helmet_black"
+	item_state = "lead_helmet_black"
+
+/obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa/brown
+	name = "\improper WY corporate security helmet"
+	desc = "A basic skull-helm with a orange saftey vison fitted. Worn by corporate security assets, graded to protect your head from an unruly scientist armed with a crowbar."
+	icon_state = "helmet_brown"
+	item_state = "helmet_brown"
+	contained_sprite = TRUE
+
 //FIORINA / UA RIOT CONTROL HELMET//
 
 /obj/item/clothing/head/helmet/marine/veteran/ua_riot

code/modules/clothing/under/marine_uniform.dm

@@ -499,6 +499,25 @@
 	item_state = "lead_uniform"
 	worn_state = "lead_uniform"
 
+// HYBRISA - GOONS
+
+/obj/item/clothing/under/marine/veteran/pmc/corporate/hybrisa
+	name = "\improper WY corporate security uniform"
+	desc = "An armored uniform worn by Weyland-Yutani corporate security members. This variant is commonly worn by what are known as 'goons'."
+	icon = 'icons/mob/humans/onmob/contained/hybrisa_goons.dmi'
+	icon_state = "uniform_hybrisa"
+	item_state = "uniform_hybrisa"
+	worn_state = "uniform_hybrisa"
+	contained_sprite = TRUE
+	item_state_slots = null
+	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
+
+/obj/item/clothing/under/marine/veteran/pmc/corporate/hybrisa/lead
+	desc = "An armored uniform worn by Weyland-Yutani corporate security members. This variant is commonly worn by the lead of the 'goonsquad', as they are colloquially known."
+	icon_state = "lead_uniform_hybrisa"
+	item_state = "lead_uniform_hybrisa"
+	worn_state = "lead_uniform_hybrisa"
+
 //=========================//UPP\\================================\\
 
 /obj/item/clothing/under/marine/veteran/bear

code/modules/gear_presets/corpses.dm

@@ -742,6 +742,64 @@
 
 //*****************************************************************************************************/
 
+// Hybrisa Goon
+
+/datum/equipment_preset/corpse/pmc/hybrisa_goon
+	name = "Corpse - Weyland-Yutani Corporate (Goon)"
+	languages = list(LANGUAGE_ENGLISH)
+	assignment = JOB_WY_GOON
+	rank = JOB_WY_GOON
+	paygrade = PAY_SHORT_CPO
+
+/datum/equipment_preset/corpse/pmc/hybrisa_goon/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/hybrisa, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa, WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78, WEAR_WAIST)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE)
+
+/datum/equipment_preset/corpse/pmc/hybrisa_goon/burst
+	name = "Corpse - Burst Weyland-Yutani Corporate Security (Goon)"
+	xenovictim = TRUE
+
+//*****************************************************************************************************/
+
+// Hybrisa Lead Goon
+
+/datum/equipment_preset/corpse/pmc/hybrisa_goon/lead
+	name = "Corpse - Weyland-Yutani Corporate Security Lead (Goon Lead)"
+	flags = EQUIPMENT_PRESET_EXTRA
+	assignment = JOB_WY_GOON_LEAD
+	rank = JOB_WY_GOON_LEAD
+	paygrade = PAY_SHORT_CSPO
+
+/datum/equipment_preset/corpse/pmc/hybrisa_goon/lead/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/hybrisa/lead, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa/lead, WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78, WEAR_WAIST)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE)
+
+/datum/equipment_preset/corpse/pmc/hybrisa_goon/lead/burst
+	name = "Corpse - Burst Weyland-Yutani Corporate Security Lead (Goon Lead)"
+	xenovictim = TRUE
+
+//*****************************************************************************************************/
+
 //Freelancer
 
 /datum/equipment_preset/corpse/freelancer

code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm

@@ -0,0 +1,115 @@
+// Civillian
+
+/datum/equipment_preset/survivor/chaplain/hybrisa
+	name = "Survivor - Hybrisa Chaplain"
+	assignment = "Hybrisa Chaplain"
+
+/datum/equipment_preset/survivor/chaplain/hybrisa/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/nun(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/nun_hood(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET)
+	..()
+
+// Colonial Marshalls
+
+/datum/equipment_preset/survivor/colonial_marshal/hybrisa
+	name = "Survivor - Hybrisa Colonial Marshal Deputy"
+	assignment = "CMB Deputy"
+
+/datum/equipment_preset/survivor/colonial_marshal/hybrisa/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc(new_human), WEAR_FEET)
+	..()
+
+// Doctors / Science
+
+/datum/equipment_preset/survivor/doctor/hybrisa
+	name = "Survivor - Hybrisa Doctor"
+	assignment = "Hybrisa  Doctor"
+
+/datum/equipment_preset/survivor/doctor/hybrisa/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET)
+	..()
+
+/datum/equipment_preset/survivor/scientist/hybrisa
+	name = "Survivor - Hybrisa Researcher"
+	assignment = "Hybrisa  Researcher"
+
+/datum/equipment_preset/survivor/scientist/hybrisa/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/rd(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/jan(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/researcher(new_human), WEAR_JACKET)
+	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/shoes/laceup/brown(new_human), WEAR_FEET)
+	..()
+
+// Engineering
+
+/datum/equipment_preset/survivor/trucker/hybrisa
+	name = "Survivor - Hybrisa Heavy Vehicle Operator"
+	assignment = "Hybrisa  Heavy Vehicle Operator"
+	skills = /datum/skills/civilian/survivor/trucker
+
+/datum/equipment_preset/survivor/trucker/hybrisa/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/green(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/grey(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
+	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/head/soft/trucker(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank(new_human), WEAR_IN_BACK)
+	..()
+
+/datum/equipment_preset/survivor/engineer/hybrisa/hydro
+	name = "Survivor - Hydro Electric Engineer"
+	assignment = "Hydro Electric Engineer"
+
+/datum/equipment_preset/survivor/engineer/hybrisa/hydro/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY)
+	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/storage/backpack/satchel/eng(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD)
+	..()
+
+/datum/equipment_preset/survivor/engineer/hybrisa
+	name = "Survivor -  Maintenance Technician"
+	assignment = " Maintenance Technician"
+
+/datum/equipment_preset/survivor/engineer/hybrisa/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(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/head/hardhat/orange(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
+	..()
+
+// Weyland Yutani Corpo
+
+/datum/equipment_preset/survivor/corporate/hybrisa
+	name = "Survivor - Hybrisa Corporate Liaison"
+	assignment = "Hybrisa  Corporate Liaison"
+
+/datum/equipment_preset/survivor/corporate/hybrisa/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
+	..()
+
+/datum/equipment_preset/survivor/security/hybrisa
+	name = "Survivor - Hybrisa Security Guard"
+	assignment = "Hybrisa Security Guard"
+
+/datum/equipment_preset/survivor/security/hybrisa/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET)
+	..()

maps/lv759_hybrisa_prospera.json

@@ -7,7 +7,19 @@
 
     "weather_holder": "/datum/weather_ss_map_holder/lv759_hybrisa_prospera",
     "survivor_types": [
-        "/datum/equipment_preset/survivor/forecon/standard"
+        "/datum/equipment_preset/survivor/doctor/hybrisa",
+        "/datum/equipment_preset/survivor/scientist/hybrisa",
+        "/datum/equipment_preset/survivor/roughneck",
+        "/datum/equipment_preset/survivor/chaplain/hybrisa",
+        "/datum/equipment_preset/survivor/interstellar_commerce_commission_liaison",
+        "/datum/equipment_preset/survivor/colonial_marshal/hybrisa",
+        "/datum/equipment_preset/survivor/engineer/hybrisa",
+        "/datum/equipment_preset/survivor/engineer/hybrisa/hydro",
+        "/datum/equipment_preset/survivor/trucker/hybrisa",
+        "/datum/equipment_preset/survivor/security/hybrisa",
+        "/datum/equipment_preset/survivor/corporate/hybrisa",
+        "/datum/equipment_preset/survivor/clf",
+        "/datum/equipment_preset/survivor/civilian"
     ],
 	"synth_survivor_types": [
         "/datum/equipment_preset/synth/survivor/forecon"