add: Black mesa return (#35)

code/__DEFINES/sound.dm

@@ -144,6 +144,7 @@
 #define ANNOUNCER_SPOOKY "announcer_spooky"
 #define ANNOUNCER_ERTYES "announcer_ertyes"
 #define ANNOUNCER_MUTANTS "announcer_mutants"
+#define ANNOUNCER_KLAXON "announcer_klaxon"
 #define ANNOUNCER_NRI_RAIDERS "announcer_nri_raiders"
 #define ANNOUNCER_OUTBREAK6 "announcer_outbreak6"
 #define ANNOUNCER_DEPARTMENTAL "announcer_departmental"
@@ -190,6 +191,7 @@ GLOBAL_LIST_INIT(announcer_keys, list(
 	ANNOUNCER_SPOOKY,
 	ANNOUNCER_ERTYES,
 	ANNOUNCER_MUTANTS,
+	ANNOUNCER_KLAXON,
 	ANNOUNCER_NRI_RAIDERS,
 	ANNOUNCER_OUTBREAK6,
 	//NOVA EDIT END

code/game/objects/effects/mines.dm

@@ -155,6 +155,7 @@
 	var/range_flame = 0
 	/// The flash range of the resulting explosion.
 	var/range_flash = 3
+	arm_delay = 1.5 SECONDS
 
 /obj/effect/mine/explosive/mineEffect(mob/victim)
 	explosion(src, range_devastation, range_heavy, range_light, range_flame, range_flash)

code/modules/unit_tests/simple_animal_freeze.dm

@@ -73,6 +73,28 @@
 		/mob/living/simple_animal/hostile/vatbeast,
 		/mob/living/simple_animal/hostile/zombie,
 		/mob/living/simple_animal/soulscythe,
+		/mob/living/simple_animal/hostile/blackmesa,
+		/mob/living/simple_animal/hostile/blackmesa/xen,
+		/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie,
+		/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman,
+		/mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt,
+		/mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt/slave,
+		/mob/living/simple_animal/hostile/blackmesa/xen/bullsquid,
+		/mob/living/simple_animal/hostile/blackmesa/xen/nihilanth,
+		/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/scientist,
+		/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/guard,
+		/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hecu,
+		/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hev,
+		/mob/living/simple_animal/hostile/blackmesa/xen/headcrab,
+		/mob/living/simple_animal/hostile/blackmesa/xen/headcrab/fast,
+		/mob/living/simple_animal/hostile/blackmesa/xen/houndeye,
+		/mob/living/simple_animal/hostile/blackmesa/hecu,
+		/mob/living/simple_animal/hostile/blackmesa/hecu/ranged,
+		/mob/living/simple_animal/hostile/blackmesa/hecu/ranged/smg,
+		/mob/living/simple_animal/hostile/blackmesa/sec,
+		/mob/living/simple_animal/hostile/blackmesa/sec/ranged,
+		/mob/living/simple_animal/hostile/blackmesa/blackops,
+		/mob/living/simple_animal/hostile/blackmesa/blackops/ranged,
 
 		// MODULAR NOVA ENTRIES
 		// PLEASE REFACTOR THESE AS YOU CAN

modular_nova/master_files/code/game/objects/effects/decals/remains.dm

@@ -1,2 +1,2 @@
 /obj/effect/decal/remains/NeverShouldHaveComeHere(turf/here_turf)
-	return !islava(here_turf) && ..()
+	return !islava(here_turf) && !(istype(here_turf, /turf/open/water/beach/xen) || istype(here_turf, /turf/open/misc/beach/coastline_t) || istype(here_turf, /turf/open/water/xen_acid)) && ..()

modular_nova/modules/alerts/code/default_announcer.dm

@@ -40,6 +40,7 @@
 		ANNOUNCER_SPOOKY = 'modular_nova/modules/alerts/sound/misc/admin_horror_music.ogg',
 		ANNOUNCER_ERTYES = 'modular_nova/modules/alerts/sound/alerts/yesert.ogg',
 		ANNOUNCER_MUTANTS = 'modular_nova/modules/alerts/sound/alerts/hazdet.ogg',
+		ANNOUNCER_KLAXON = 'modular_ss220/modules/return_prs/black_mesa/sound/siren1_long.ogg',
 		ANNOUNCER_NRI_RAIDERS = 'modular_nova/modules/encounters/sounds/morse.ogg',
 		ANNOUNCER_DEPARTMENTAL = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg',
 		ANNOUNCER_SHUTTLE = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg',

modular_nova/modules/blueshield/code/blueshield.dm

@@ -47,7 +47,7 @@
 	jobtype = /datum/job/blueshield
 	uniform = /obj/item/clothing/under/rank/blueshield
 	suit = /obj/item/clothing/suit/armor/vest/blueshield/jacket
-	gloves = /obj/item/clothing/gloves/tackler/security
+	gloves = /obj/item/clothing/gloves/tackler/combat/insulated/blueshield
 	id = /obj/item/card/id/advanced/centcom
 	shoes = /obj/item/clothing/shoes/jackboots
 	ears = /obj/item/radio/headset/headset_bs/alt
@@ -65,6 +65,9 @@
 	box = /obj/item/storage/box/survival/security
 	belt = /obj/item/modular_computer/pda/security
 	l_pocket = /obj/item/sensor_device/blueshield
+	backpack_contents = list(
+							/obj/item/storage/medkit/tactical/blueshield
+	)
 
 	id_trim = /datum/id_trim/job/blueshield
 
@@ -104,3 +107,16 @@
 	)
 
 	return selectable_gun_types
+
+/obj/item/storage/medkit/tactical/blueshield
+	name = "blueshield combat medical kit"
+	desc = "Combat medic to the rescue!"
+	color = "#AAAAFF"
+
+/obj/item/storage/medkit/tactical/blueshield/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/stack/medical/gauze(src)
+	new /obj/item/stack/medical/bruise_pack(src)
+	new /obj/item/stack/medical/ointment(src)
+	new /obj/item/healthanalyzer(src)

modular_nova/modules/blueshield/code/closet.dm

@@ -18,7 +18,7 @@
 	name = "blueshield's locker"
 	icon_state = "bs"
 	icon = 'modular_nova/master_files/icons/obj/closet.dmi'
-	req_access = list(ACCESS_CAPTAIN)
+	req_access = list(ACCESS_CENT_GENERAL)
 
 /obj/structure/closet/secure_closet/blueshield/New()
 	..()

modular_nova/modules/blueshield/code/clothing.dm

@@ -2,6 +2,20 @@
 
 //Uniform items are in command.dm
 
+/datum/armor/gloves_combat/blueshield
+	fire = 100
+	acid = 100
+	bio = 90
+
+/obj/item/clothing/gloves/tackler/combat/insulated/blueshield
+	name = "combat gloves"
+	desc = "These tactical gloves appear to be unique, made out of double woven durathread fibers which make it fireproof as well as acid resistant"
+	icon = 'modular_nova/master_files/icons/obj/clothing/gloves.dmi'
+	icon_state = "combat"
+	worn_icon = 'modular_nova/master_files/icons/mob/clothing/hands.dmi'
+	resistance_flags = FIRE_PROOF |  ACID_PROOF
+	armor_type = /datum/armor/gloves_combat/blueshield
+
 /obj/item/radio/headset/headset_bs
 	name = "\proper the blueshield's headset"
 	icon = 'modular_nova/modules/blueshield/icons/radio.dmi'
@@ -42,13 +56,24 @@
 	fire = 95
 	acid = 95
 
+/datum/armor/beret_blueshield
+	melee = 40
+	bullet = 35
+	laser = 30
+	energy = 20
+	bomb = 30
+	fire = 80
+	acid = 80
+	wound = 15
+
 /obj/item/clothing/head/beret/blueshield
 	name = "blueshield's beret"
 	desc = "A blue beret made of durathread with a genuine golden badge, denoting its owner as a Blueshield Lieuteneant. It seems to be padded with nano-kevlar, making it tougher than standard reinforced berets."
 	greyscale_config = /datum/greyscale_config/beret_badge
 	greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
 	greyscale_colors = "#3A4E7D#DEB63D"
 	icon_state = "beret_badge_police"
+	armor_type = /datum/armor/beret_blueshield
 	supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
 
 /obj/item/clothing/head/beret/blueshield/navy
@@ -87,6 +112,16 @@
 	inhand_icon_state = "duffel_blueshield"
 
 //blueshield armor
+/datum/armor/suit_armor/blueshield
+	melee = 40
+	bullet = 35
+	laser = 30
+	energy = 25
+	bomb = 30
+	fire = 75
+	acid = 75
+	wound = 15
+
 /obj/item/clothing/suit/armor/vest/blueshield
 	icon = 'modular_nova/master_files/icons/obj/clothing/suits/armor.dmi'
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/suits/armor.dmi'
@@ -95,6 +130,7 @@
 	icon_state = "blueshieldarmor"
 	body_parts_covered = CHEST
 	uses_advanced_reskins = TRUE
+	armor_type = /datum/armor/suit_armor/blueshield
 	unique_reskin = list(
 		"Slim" = list(
 			RESKIN_ICON = 'modular_nova/master_files/icons/obj/clothing/suits/armor.dmi',
@@ -133,7 +169,7 @@
 	desc = "A comfy kevlar-lined coat with blue highlights, fit to keep the blueshield armored and warm."
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/nova/blueshield
 	allowed = list(/obj/item/melee/baton/security/loaded)
-	armor_type = /datum/armor/suit_armor
+	armor_type = /datum/armor/suit_armor/blueshield
 
 /obj/item/clothing/suit/hooded/wintercoat/nova/blueshield/Initialize(mapload)
 	. = ..()
@@ -142,4 +178,4 @@
 /obj/item/clothing/head/hooded/winterhood/nova/blueshield
 	icon_state = "hood_blueshield"
 	desc = "A comfy kevlar-lined hood to go with the comfy kevlar-lined coat."
-	armor_type = /datum/armor/suit_armor
+	armor_type = /datum/armor/suit_armor/blueshield

modular_nova/modules/blueshield/code/modsuit/mod_theme.dm

@@ -10,10 +10,15 @@
 		fires, electrical shocks, and contempt from the rest of the crew."
 
 	default_skin = "praetorian"
-	armor_type = /datum/armor/mod_theme_security
+	armor_type = /datum/armor/mod_theme_blueshield
 	atom_flags = PREVENT_CONTENTS_EXPLOSION_1
-	slowdown_inactive = 1
-	slowdown_active = 0.5
+	slowdown_inactive = 0.75
+	slowdown_active = 0.25
+	resistance_flags = FIRE_PROOF|ACID_PROOF
+	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+	siemens_coefficient = 0
+	complexity_max = DEFAULT_MAX_COMPLEXITY + 3
+	inbuilt_modules = list(/obj/item/mod/module/shove_blocker/locked)
 	allowed_suit_storage = list(
 		/obj/item/reagent_containers/spray/pepper,
 		/obj/item/restraints/handcuffs,
@@ -57,3 +62,14 @@
 			),
 		),
 	)
+
+/datum/armor/mod_theme_blueshield
+	melee = 40
+	bullet = 30
+	laser = 30
+	energy = 40
+	bomb = 50
+	bio = 100
+	fire = 100
+	acid = 100
+	wound = 20

modular_nova/modules/blueshield/code/modsuit/mod_type.dm

@@ -4,11 +4,14 @@
 	icon_state = "praetorian-control"
 	theme = /datum/mod_theme/blueshield
 	applied_cell = /obj/item/stock_parts/power_store/cell/high
+	req_access = list(ACCESS_CENT_GENERAL)
 	applied_modules = list(
+		/obj/item/mod/module/quick_cuff,
 		/obj/item/mod/module/storage,
 		/obj/item/mod/module/magnetic_harness,
 		/obj/item/mod/module/flashlight,
 		/obj/item/mod/module/projectile_dampener,
 		/obj/item/mod/module/quick_carry,
 		/obj/item/mod/module/holster,
+		/obj/item/mod/module/headprotector,
 	)

modular_nova/modules/exp_corps/code/clothing.dm

@@ -11,8 +11,15 @@
 	random_sensor = FALSE
 
 /datum/armor/clothing_under/rank_expeditionary_corps
-	fire = 15
-	acid = 15
+	melee = 10
+	bullet = 0
+	laser = 0
+	energy = 0
+	bomb = 10
+	bio = 10
+	fire = 30
+	acid = 30
+	wound = 10
 
 /obj/item/storage/belt/military/expeditionary_corps
 	name = "expeditionary corps chest rig"
@@ -81,6 +88,18 @@
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/feet.dmi'
 	icon_state = "exp_corps"
 	inhand_icon_state = "jackboots"
+	armor_type = /datum/armor/clothing_under/rank_expeditionary_corps_boots
+
+/datum/armor/clothing_under/rank_expeditionary_corps_boots
+	melee = 40
+	bullet = 40
+	laser = 40
+	energy = 40
+	bomb = 40
+	bio = 0
+	fire = 80
+	acid = 100
+	wound = 30
 
 /obj/item/clothing/gloves/color/black/expeditionary_corps
 	name = "expeditionary corps gloves"
@@ -147,7 +166,7 @@
 
 /obj/item/clothing/suit/armor/vest/expeditionary_corps
 	name = "expeditionary corps armor vest"
-	desc = "An armored vest that provides okay protection against most types of damage. Includes concealable sleeves for your arms."
+	desc = "An armored vest that provides decent protection against most types of damage."
 	icon = 'modular_nova/master_files/icons/obj/clothing/suits/armor.dmi'
 	worn_icon = 'modular_nova/master_files/icons/mob/clothing/suits/armor.dmi'
 	icon_state = "exp_corps"
@@ -172,14 +191,14 @@
 
 
 /datum/armor/vest_expeditionary_corps
-	melee = 30
-	bullet = 30
-	laser = 30
-	energy = 30
+	melee = 40
+	bullet = 40
+	laser = 40
+	energy = 40
 	bomb = 40
 	fire = 80
 	acid = 100
-	wound = 10
+	wound = 30
 
 /obj/item/clothing/head/helmet/expeditionary_corps
 	name = "expeditionary corps helmet"
@@ -194,14 +213,14 @@
 	actions_types = list(/datum/action/item_action/toggle_nv_helmet)
 
 /datum/armor/helmet_expeditionary_corps
-	melee = 20
-	bullet = 20
-	laser = 20
-	energy = 20
+	melee = 30
+	bullet = 30
+	laser = 30
+	energy = 30
 	bomb = 30
 	fire = 80
 	acid = 100
-	wound = 10
+	wound = 30
 
 /datum/action/item_action/toggle_nv_helmet
 	name = "Toggle Nightvision"

modular_nova/modules/exp_corps/code/tomahawk.dm

@@ -1,16 +1,16 @@
 /obj/item/melee/tomahawk
 	name = "expeditionary tomahawk"
-	desc = "A decently sharp axe blade upon a short fibremetal handle. "
+	desc = "A very sharp axe blade upon a short fibremetal handle."
 	icon = 'modular_nova/modules/exp_corps/icons/tomahawk.dmi'
 	icon_state = "tomahawk"
 	inhand_icon_state = "tomahawk"
 	lefthand_file = 'modular_nova/modules/exp_corps/icons/tomahawk_l.dmi'
 	righthand_file = 'modular_nova/modules/exp_corps/icons/tomahawk_r.dmi'
 	worn_icon = 'modular_nova/modules/exp_corps/icons/tomahawk_worn.dmi'
 	obj_flags = CONDUCTS_ELECTRICITY
-	force = 15 //Equivalent to a survival knife
+	force = 25
 	w_class = WEIGHT_CLASS_SMALL
-	throwforce = 18
+	throwforce = 25
 	throw_speed = 4
 	throw_range = 8
 	embed_type = /datum/embed_data/tomahawk

modular_ss220/modules/return_prs/_vars/vars.dm

@@ -0,0 +1,5 @@
+#define COMPANY_IZHEVSK "It has <b>[span_brown("Izhevsk Coalition")]</b> cut into it."
+#define COMPANY_TKACH "It has <b>[span_robot("Tkach Design Bureau")]</b> stamped onto it."
+
+#define SECHUD_MESA_SEC "hudmesaguard"
+#define SECHUD_MESA_SCI  "hudmesasci"