map changes, black goo changes ect.

code/game/area/LV759_Hybrisa_Prospera.dm

@@ -99,6 +99,7 @@
 	name = "Derelict Ship"
 	icon_state = "derelictship"
 	ceiling = CEILING_MAX
+	ceiling_muffle = FALSE
 	flags_area = AREA_NOTUNNEL
 	ambience_exterior = AMBIENCE_DERELICT
 	soundscape_playlist = SCAPE_PL_LV759_DERELICTSHIP
@@ -928,3 +929,8 @@
 	icon_state = "wylab"
 	ambience_exterior = AMBIENCE_LAB
 	soundscape_playlist = SCAPE_PL_LV759_INDOORS
+/area/lv759/indoors/wy_research_complex/head_research_office
+	name = "Weyland-Yutani - Advanced Bio-Genomic Research Complex - Head of Research's Office"
+	icon_state = "wylab"
+	ambience_exterior = AMBIENCE_LAB
+	soundscape_playlist = SCAPE_PL_LV759_INDOORS

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

@@ -88,23 +88,6 @@
 	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///
 
@@ -228,3 +211,26 @@
 /obj/effect/landmark/corpsespawner/forecon_spotter
 	name = "USCM Reconnaissance Spotter"
 	equip_path = /datum/equipment_preset/corpse/forecon_spotter
+
+
+///////////////////////
+/////// HYBRISA ///////
+///////////////////////
+
+// 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

code/modules/clothing/under/marine_uniform.dm

@@ -499,25 +499,6 @@
 	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
@@ -1217,3 +1198,26 @@
 	armor_rad = CLOTHING_ARMOR_GIGAHIGHPLUS
 	armor_internaldamage = CLOTHING_ARMOR_HIGHPLUS
 	hood_type = /obj/item/clothing/head/helmet/marine/cbrn_hood/advanced
+
+///////////////////////
+/////// HYBRISA ///////
+///////////////////////
+
+// 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"

code/modules/gear_presets/corpses.dm

@@ -742,64 +742,6 @@
 
 //*****************************************************************************************************/
 
-// 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
@@ -1052,3 +994,64 @@
 	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET)
 	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/device/radio(new_human), WEAR_IN_BACK)
+
+//*****************************************************************************************************/
+///////////////////////
+/////// HYBRISA ///////
+///////////////////////
+
+// 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