From 50b20068cf08494dad967ca8a178085eaed0daf7 Mon Sep 17 00:00:00 2001
From: Arceniu <129214736+Arceniu@users.noreply.github.com>
Date: Mon, 1 Jul 2024 20:22:45 +0300
Subject: [PATCH] bugfix: mesa autolathe compatibility, mmg fix, blueshield gun
 return (#36)

---
 _maps/RandomZLevels/blackmesa.dmm             | 149 +++++++++++++++---
 .../modules/blueshield/code/blueshield.dm     |   7 +-
 .../code/mounted_machine_gun.dm               |   2 +
 .../black_mesa/code/ghost_spawners.dm         |   8 +-
 .../return_prs/black_mesa/code/weapons.dm     |   9 +-
 .../black_mesa/hev_suit/code/hev_suit.dm      |   4 +
 6 files changed, 140 insertions(+), 39 deletions(-)

diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm
index e1110d716950d14..e87a984aa55a2e9 100644
--- a/_maps/RandomZLevels/blackmesa.dmm
+++ b/_maps/RandomZLevels/blackmesa.dmm
@@ -1723,6 +1723,7 @@
 /area/awaymission/black_mesa/security_outpost)
 "awI" = (
 /obj/item/gun_maintenance_supplies,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/awaymission/black_mesa/security_outpost)
 "awL" = (
@@ -1994,6 +1995,7 @@
 /obj/item/radio/intercom/directional/west{
 	pixel_y = 5
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/awaymission/black_mesa/security_outpost)
 "aAq" = (
@@ -5463,6 +5465,7 @@
 /obj/item/storage/medkit/emergency,
 /obj/item/keycard/stockroom,
 /obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/item/crowbar/makeshift,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_internal)
 "dIH" = (
@@ -5956,6 +5959,16 @@
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/hecu_zone_camp)
+"eEM" = (
+/obj/machinery/power/apc/auto_name/directional/south{
+	auto_name = 0
+	},
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable,
+/turf/open/misc/ironsand/black_mesa,
+/area/awaymission/black_mesa/hecu_zone_camp)
 "eFZ" = (
 /obj/effect/turf_decal/stripes,
 /obj/structure/table,
@@ -6923,6 +6936,10 @@
 	icon_state = "bus"
 	},
 /area/awaymission/black_mesa/black_ops_bus)
+"gEm" = (
+/obj/structure/cable,
+/turf/open/floor/iron/textured,
+/area/awaymission/black_mesa/science_labs)
 "gEA" = (
 /obj/effect/decal/cleanable/blood/tracks,
 /obj/structure/cable,
@@ -7192,6 +7209,7 @@
 /area/awaymission/black_mesa/science_decon_room)
 "hfm" = (
 /obj/machinery/autolathe/hacked,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_labs)
 "hfP" = (
@@ -7788,6 +7806,10 @@
 /obj/structure/closet/crate/bin,
 /turf/open/floor/iron/textured,
 /area/awaymission/black_mesa/hecu_zone_atrium)
+"ipH" = (
+/obj/item/stock_parts/cell/high,
+/turf/open/floor/iron,
+/area/awaymission/black_mesa/security_outpost)
 "iqc" = (
 /obj/machinery/light/warm/directional/west,
 /turf/open/floor/iron/textured,
@@ -8050,6 +8072,7 @@
 /obj/effect/spawner/random/decoration/glowstick,
 /obj/effect/spawner/random/decoration/glowstick,
 /obj/effect/spawner/random/decoration/glowstick,
+/obj/item/stock_parts/cell/high,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/hecu_zone_camp)
 "iOl" = (
@@ -8302,6 +8325,10 @@
 /obj/effect/spawner/liquids_spawner,
 /turf/open/floor/iron/pool,
 /area/awaymission/black_mesa/deep_sci_feesh)
+"jle" = (
+/obj/structure/cable,
+/turf/open/floor/iron/textured_large,
+/area/awaymission/black_mesa/science_labs)
 "jlI" = (
 /obj/structure/rack/shelf,
 /obj/item/assembly/signaler,
@@ -8638,6 +8665,11 @@
 /obj/item/ammo_box/magazine/g18,
 /turf/open/floor/carpet/blue,
 /area/awaymission/black_mesa/high_security_hallway)
+"jPw" = (
+/obj/machinery/door/airlock/multi_tile/public/glass,
+/obj/structure/cable,
+/turf/open/floor/iron/textured,
+/area/awaymission/black_mesa/science_labs)
 "jPD" = (
 /obj/effect/mob_spawn/corpse/human/hecu_zombie,
 /turf/open/floor/iron/textured,
@@ -8806,6 +8838,7 @@
 /area/awaymission/black_mesa/science_labs)
 "kfR" = (
 /obj/machinery/hypnochair,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_labs)
 "khd" = (
@@ -9121,6 +9154,15 @@
 /obj/item/knife/combat/throwing,
 /turf/open/floor/iron/smooth,
 /area/awaymission/black_mesa/dorm_computers)
+"kOP" = (
+/obj/item/ammo_box/magazine/mp5,
+/obj/machinery/power/apc/auto_name/directional/south{
+	auto_name = 0
+	},
+/obj/machinery/power/terminal,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/awaymission/black_mesa/security_outpost)
 "kPC" = (
 /obj/effect/random_mob_placer/xen/zombie,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
@@ -9196,6 +9238,7 @@
 	id_tag = "chemiguess"
 	},
 /obj/effect/mapping_helpers/airlock/locked,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_labs)
 "kWg" = (
@@ -9917,6 +9960,11 @@
 /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/hev,
 /turf/open/floor/plating,
 /area/awaymission/black_mesa/resonant_chamber)
+"mnN" = (
+/obj/item/ammo_box/magazine/g18,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/awaymission/black_mesa/security_outpost)
 "mnS" = (
 /obj/effect/turf_decal/trimline/dark_blue/filled/line,
 /obj/structure/chair/sofa/bench{
@@ -10265,6 +10313,19 @@
 "ncO" = (
 /turf/closed/indestructible/rock/xen,
 /area/awaymission/black_mesa/xen/village_hallway)
+"ndu" = (
+/obj/structure/table,
+/obj/item/paper,
+/obj/structure/alien/weeds/xen,
+/obj/machinery/power/apc/auto_name/directional/north{
+	auto_name = 0
+	},
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/apc/cell_10k,
+/turf/open/floor/iron/textured_large,
+/area/awaymission/black_mesa/entrance_large_office)
 "ndA" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing{
@@ -10530,6 +10591,11 @@
 /obj/effect/baseturf_helper/black_mesa,
 /turf/closed/wall/r_wall,
 /area/awaymission/black_mesa/high_security_sec_point)
+"nyS" = (
+/obj/effect/decal/cleanable/blood/footprints,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/awaymission/black_mesa/security_outpost)
 "nyU" = (
 /obj/structure/closet/crate/large,
 /turf/open/floor/plating,
@@ -10694,6 +10760,7 @@
 /area/awaymission/black_mesa/hecu_zone_test_chambers)
 "nOK" = (
 /obj/machinery/door/airlock/science,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_labs)
 "nPg" = (
@@ -11368,6 +11435,10 @@
 /obj/machinery/light/cold,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/resonant_chamber)
+"pjt" = (
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/awaymission/black_mesa/science_labs)
 "pjD" = (
 /obj/structure/table,
 /obj/item/knife/plastic,
@@ -12143,6 +12214,7 @@
 	name = "solid thing"
 	},
 /obj/item/storage/box/beakers/variety,
+/obj/item/stock_parts/cell/high,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_labs)
 "qLg" = (
@@ -12728,6 +12800,7 @@
 "rLR" = (
 /obj/machinery/light/cold/directional/east,
 /obj/structure/closet/crate/engineering/electrical,
+/obj/item/wrench/bolter,
 /turf/open/floor/iron/textured_large,
 /area/awaymission/black_mesa/black_ops_bus)
 "rMt" = (
@@ -12840,6 +12913,7 @@
 /obj/item/stack/sheet/glass{
 	amount = 30
 	},
+/obj/item/stock_parts/cell/high,
 /turf/open/floor/iron/textured_large,
 /area/awaymission/black_mesa/black_ops_eng_storage)
 "rVo" = (
@@ -13837,6 +13911,16 @@
 /obj/effect/mob_spawn/corpse/human/scientist_zombie,
 /turf/open/floor/iron/dark/textured_large,
 /area/awaymission/black_mesa/black_ops_bus)
+"tYH" = (
+/obj/machinery/power/apc/auto_name/directional/north{
+	auto_name = 0
+	},
+/obj/effect/mapping_helpers/apc/cell_10k,
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/turf/open/floor/iron/textured_large,
+/area/awaymission/black_mesa/black_ops_eng_storage)
 "tZd" = (
 /obj/effect/mob_spawn/corpse/human/scientist_zombie,
 /turf/open/floor/iron/smooth,
@@ -13937,6 +14021,12 @@
 /obj/structure/table,
 /obj/machinery/light/cold,
 /obj/item/storage/toolbox/mechanical,
+/obj/machinery/power/apc/auto_name/directional/south{
+	auto_name = 0
+	},
+/obj/machinery/power/terminal,
+/obj/item/wrench/bolter,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/awaymission/black_mesa/science_labs)
 "ump" = (
@@ -13950,6 +14040,11 @@
 	},
 /turf/open/floor/iron/textured,
 /area/awaymission/black_mesa/black_ops_button)
+"uoe" = (
+/obj/structure/closet/crate/large,
+/obj/item/wrench/bolter,
+/turf/open/floor/plating,
+/area/awaymission/black_mesa/science_tunnel)
 "uot" = (
 /obj/machinery/light/cold/directional/north,
 /obj/machinery/chem_master,
@@ -14204,6 +14299,8 @@
 /obj/structure/railing{
 	dir = 9
 	},
+/obj/machinery/power/smes/super/full,
+/obj/structure/cable,
 /turf/open/floor/iron/textured_large,
 /area/awaymission/black_mesa/science_labs)
 "uOn" = (
@@ -14635,6 +14732,7 @@
 /obj/structure/sign/departments/science/alt{
 	pixel_x = -31
 	},
+/obj/structure/cable,
 /turf/open/floor/iron/textured,
 /area/awaymission/black_mesa/science_labs)
 "vAB" = (
@@ -15856,6 +15954,11 @@
 "xPM" = (
 /turf/open/floor/iron/textured,
 /area/awaymission/black_mesa/black_ops_hall)
+"xQD" = (
+/obj/machinery/power/terminal,
+/obj/structure/cable,
+/turf/open/floor/iron/textured,
+/area/awaymission/black_mesa/science_labs)
 "xQH" = (
 /obj/structure/table,
 /obj/structure/sign/warning/no_smoking/circle/directional/north,
@@ -44182,7 +44285,7 @@ gdr
 gdr
 wAJ
 dsI
-gdr
+eEM
 ugW
 lXv
 lXv
@@ -47400,7 +47503,7 @@ rTN
 aSV
 aHK
 asd
-axn
+kOP
 aVW
 aNo
 aNo
@@ -47914,7 +48017,7 @@ arT
 aXH
 amW
 azp
-ayQ
+mnN
 aVW
 aGj
 aYJ
@@ -48171,7 +48274,7 @@ aOc
 aOc
 aHd
 aAp
-aSV
+aOc
 abo
 aoy
 aaO
@@ -48427,7 +48530,7 @@ axn
 aIp
 aQe
 aTL
-aQe
+nyS
 aTo
 aVW
 aGj
@@ -49199,7 +49302,7 @@ tLu
 aLz
 aHK
 aFx
-aSV
+ipH
 aVW
 aNo
 arz
@@ -52683,8 +52786,8 @@ uKX
 iar
 iar
 uKX
-gdr
-gdr
+nzT
+nzT
 nzT
 nzT
 nzT
@@ -69643,7 +69746,7 @@ ozz
 lEm
 lEm
 ozz
-lwG
+uoe
 lwG
 hjV
 xEP
@@ -69823,7 +69926,7 @@ arz
 aNo
 aNo
 qiU
-nqs
+tYH
 nqs
 nqs
 nqs
@@ -73562,7 +73665,7 @@ arz
 arz
 aNo
 kyP
-fNm
+ndu
 wHR
 sJT
 vmK
@@ -76077,13 +76180,13 @@ eKW
 iYD
 rbu
 qXZ
-rfj
+pjt
 nOK
-rfj
-rSl
-rSl
-rSl
-rSl
+pjt
+jle
+jle
+jle
+jle
 kfR
 rbu
 aNo
@@ -76334,7 +76437,7 @@ eKW
 rbu
 rbu
 bEa
-rfj
+pjt
 rbu
 lgz
 fgR
@@ -76845,10 +76948,10 @@ wbL
 maZ
 eKW
 eKW
-eKW
-khG
+gEm
+jPw
 vAi
-eKW
+gEm
 khG
 qNk
 eKW
@@ -77102,7 +77205,7 @@ wbL
 maZ
 eKW
 eKW
-eKW
+gEm
 eKW
 eKW
 eKW
@@ -77358,7 +77461,7 @@ rbu
 mYF
 ycb
 eKW
-eKW
+xQD
 uOe
 rbu
 rbu
diff --git a/modular_nova/modules/blueshield/code/blueshield.dm b/modular_nova/modules/blueshield/code/blueshield.dm
index cdfb71b579c99c7..f3c8060084b724c 100644
--- a/modular_nova/modules/blueshield/code/blueshield.dm
+++ b/modular_nova/modules/blueshield/code/blueshield.dm
@@ -53,20 +53,17 @@
 	ears = /obj/item/radio/headset/headset_bs/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	implants = list(/obj/item/implant/mindshield)
-	backpack_contents = list(
-		/obj/item/choice_beacon/blueshield = 1,
-	)
 	backpack = /obj/item/storage/backpack/blueshield
 	satchel = /obj/item/storage/backpack/satchel/blueshield
 	duffelbag = /obj/item/storage/backpack/duffelbag/blueshield
 	messenger = /obj/item/storage/backpack/messenger/blueshield
-
 	head = /obj/item/clothing/head/beret/blueshield
 	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
+							/obj/item/storage/medkit/tactical/blueshield,
+							/obj/item/choice_beacon/blueshield = 1,
 	)
 
 	id_trim = /datum/id_trim/job/blueshield
diff --git a/modular_nova/modules/mounted_machine_gun/code/mounted_machine_gun.dm b/modular_nova/modules/mounted_machine_gun/code/mounted_machine_gun.dm
index 8824e314e051119..a1a57a52fbf8a28 100644
--- a/modular_nova/modules/mounted_machine_gun/code/mounted_machine_gun.dm
+++ b/modular_nova/modules/mounted_machine_gun/code/mounted_machine_gun.dm
@@ -135,6 +135,8 @@
 	var/obj/undeployed_object = new undeployed_type(src)
 	//Keeps the health the same even if you redeploy the gun
 	undeployed_object.modify_max_integrity(max_integrity)
+	if(!user.put_in_hands(undeployed_object))
+		undeployed_object.forceMove(loc)
 	qdel(src)
 
 //BUCKLE HOOKS
diff --git a/modular_ss220/modules/return_prs/black_mesa/code/ghost_spawners.dm b/modular_ss220/modules/return_prs/black_mesa/code/ghost_spawners.dm
index d62896cbf1f86c7..df6f851df1f0177 100644
--- a/modular_ss220/modules/return_prs/black_mesa/code/ghost_spawners.dm
+++ b/modular_ss220/modules/return_prs/black_mesa/code/ghost_spawners.dm
@@ -23,7 +23,7 @@
 	backpack_contents = list(/obj/item/radio,
 							/obj/item/reagent_containers/cup/beaker,
 	)
-	id = /obj/item/card/id
+	id = /obj/item/card/id/advanced
 	id_trim = /datum/id_trim/science_team
 
 /datum/outfit/science_team/post_equip(mob/living/carbon/human/equipped_human, visualsOnly)
@@ -68,7 +68,7 @@
 							/obj/item/ammo_box/magazine/g18,
 							/obj/item/ammo_box/magazine/g18,
 	)
-	id = /obj/item/card/id
+	id = /obj/item/card/id/advanced
 	id_trim = /datum/id_trim/security_guard
 
 /datum/outfit/security_guard/post_equip(mob/living/carbon/human/equipped_human, visualsOnly)
@@ -168,7 +168,7 @@
 							/obj/item/storage/medkit/emergency,
 							/obj/item/armament_points_card/hecu,
 	)
-	id = /obj/item/card/id
+	id = /obj/item/card/id/advanced
 	id_trim = /datum/id_trim/hecu
 
 /datum/outfit/hecu/post_equip(mob/living/carbon/human/equipped_human, visualsOnly)
@@ -226,7 +226,7 @@
 							/obj/item/book/granter/martial/cqc,
 							/obj/item/grenade/smokebomb,
 	)
-	id = /obj/item/card/id
+	id = /obj/item/card/id/advanced
 	id_trim = /datum/id_trim/hecu_leader
 
 /datum/outfit/hecu/leader/post_equip(mob/living/carbon/human/equipped_human, visualsOnly)
diff --git a/modular_ss220/modules/return_prs/black_mesa/code/weapons.dm b/modular_ss220/modules/return_prs/black_mesa/code/weapons.dm
index ff8528ca1f6fa44..ddc0f492c56d814 100644
--- a/modular_ss220/modules/return_prs/black_mesa/code/weapons.dm
+++ b/modular_ss220/modules/return_prs/black_mesa/code/weapons.dm
@@ -22,7 +22,7 @@
 
 /obj/item/shield/riot/pointman/hecu
 	name = "ballistic shield"
-	desc = "A shield fit for those that want to sprint headfirst into the unknown! Cumbersome as hell. Repair with iron."
+	desc = "A shield fit for those that want to sprint headfirst into the unknown! Cumbersome as hell."
 	icon_state = "ballistic"
 	icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic.dmi'
 	worn_icon_state = "ballistic_worn"
@@ -41,12 +41,7 @@
 	attack_verb_simple = list("shove", "bash")
 	transparent = TRUE
 	max_integrity = 150
-	//repairable_by = /obj/item/stack/sheet/iron //what to repair the shield with
-
-
-/// /obj/item/shield/riot/pointman/hecu/shatter(mob/living/carbon/human/owner)
-///	 playsound(owner, 'sound/effects/glassbr3.ogg', 100)
-///	 new /obj/item/ballistic_broken((get_turf(src)))
+	shield_break_leftover = /obj/item/ballistic_broken
 
 /obj/item/ballistic_broken
 	name = "broken ballistic shield"
diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/code/hev_suit.dm b/modular_ss220/modules/return_prs/black_mesa/hev_suit/code/hev_suit.dm
index ac92ecbeb70df3b..991a342c4152ed1 100644
--- a/modular_ss220/modules/return_prs/black_mesa/hev_suit/code/hev_suit.dm
+++ b/modular_ss220/modules/return_prs/black_mesa/hev_suit/code/hev_suit.dm
@@ -44,6 +44,8 @@
 	visor_flags = STOPSPRESSUREDAMAGE
 	dog_fashion = null
 	slowdown = 0
+	max_heat_protection_temperature = 25000
+	min_cold_protection_temperature = 2
 
 /datum/armor/space_hev_suit
 	melee = 20
@@ -84,6 +86,8 @@
 	actions_types = list(/datum/action/item_action/hev_toggle, /datum/action/item_action/hev_toggle_notifs, /datum/action/item_action/toggle_spacesuit)
 	resistance_flags = LAVA_PROOF|FIRE_PROOF|UNACIDABLE|ACID_PROOF|INDESTRUCTIBLE|FREEZE_PROOF
 	clothing_flags = STOPSPRESSUREDAMAGE|THICKMATERIAL|SNUG_FIT|LAVAPROTECT
+	max_heat_protection_temperature = 25000
+	min_cold_protection_temperature = 2
 
 	///Whether or not the suit is activated/activating.
 	var/activated = FALSE