Merge remote-tracking branch 'upstream/master' into XM43E1-balance-at…

…tempt

code/__DEFINES/mob_hud.dm

@@ -25,6 +25,7 @@
 #define STATUS_HUD_XENO_CULTIST "24" // Whether they are a xeno cultist or not
 #define HUNTER_CLAN "25" //Displays a colored icon to represent ingame Hunter Clans
 #define HUNTER_HUD "26" //Displays various statuses on mobs for Hunters to identify targets
+#define HOLOCARD_HUD "27" //Displays the holocards set by medical personnel
 
 //data HUD (medhud, sechud) defines
 #define MOB_HUD_SECURITY_BASIC 1

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "7.1.1"
+#define TGS_DMAPI_VERSION "7.1.2"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
@@ -312,6 +312,7 @@
 	var/datum/tgs_chat_embed/structure/embed
 
 /datum/tgs_message_content/New(text)
+	..()
 	if(!istext(text))
 		TGS_ERROR_LOG("[/datum/tgs_message_content] created with no text!")
 		text = null
@@ -354,6 +355,7 @@
 	var/proxy_url
 
 /datum/tgs_chat_embed/media/New(url)
+	..()
 	if(!istext(url))
 		CRASH("[/datum/tgs_chat_embed/media] created with no url!")
 
@@ -367,6 +369,7 @@
 	var/proxy_icon_url
 
 /datum/tgs_chat_embed/footer/New(text)
+	..()
 	if(!istext(text))
 		CRASH("[/datum/tgs_chat_embed/footer] created with no text!")
 
@@ -383,6 +386,7 @@
 	var/proxy_icon_url
 
 /datum/tgs_chat_embed/provider/author/New(name)
+	..()
 	if(!istext(name))
 		CRASH("[/datum/tgs_chat_embed/provider/author] created with no name!")
 
@@ -395,6 +399,7 @@
 	var/is_inline
 
 /datum/tgs_chat_embed/field/New(name, value)
+	..()
 	if(!istext(name))
 		CRASH("[/datum/tgs_chat_embed/field] created with no name!")
 
@@ -510,7 +515,7 @@
 /*
 The MIT License
 
-Copyright (c) 2017-2023 Jordan Brown
+Copyright (c) 2017-2024 Jordan Brown
 
 Permission is hereby granted, free of charge,
 to any person obtaining a copy of this software and

code/datums/keybinding/human.dm

@@ -120,11 +120,18 @@
 	if(.)
 		return
 
+	// Get the user's marine helmet (if they're wearing one)
 	var/mob/living/carbon/human/human_user = user.mob
-	var/obj/item/clothing/head/helmet/marine/marine_helmet = human_user?.head
-	var/cycled_hud = marine_helmet?.cycle_huds(human_user)
+	var/obj/item/clothing/head/helmet/marine/marine_helmet = human_user.head
+	if(!istype(marine_helmet))
+		// If their hat isn't a marine helmet, or is null, return.
+		return
+
+	// Cycle the HUD on the helmet.
+	var/cycled_hud = marine_helmet.cycle_huds(human_user)
 
+	// Update the helmet's 'cycle hud' action button
 	var/datum/action/item_action/cycle_helmet_huds/cycle_action = locate() in marine_helmet.actions
-	cycle_action.set_action_overlay(cycled_hud)
+	cycle_action?.set_action_overlay(cycled_hud)
 
 	return TRUE

code/datums/mob_hud.dm

@@ -185,7 +185,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 
 //Factions
 /datum/mob_hud/faction
-	hud_icons = list(FACTION_HUD, ORDER_HUD)
+	hud_icons = list(FACTION_HUD, ORDER_HUD, HOLOCARD_HUD)
 	var/faction_to_check = FACTION_MARINE
 
 /datum/mob_hud/faction/add_to_single_hud(mob/user, mob/target)
@@ -209,7 +209,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
 	faction_to_check = FACTION_PMC
 
 /datum/mob_hud/faction/observer
-	hud_icons = list(FACTION_HUD, ORDER_HUD, HUNTER_CLAN)
+	hud_icons = list(FACTION_HUD, ORDER_HUD, HUNTER_CLAN, HOLOCARD_HUD)
 
 ///////// MOB PROCS //////////////////////////////:
 
@@ -753,7 +753,13 @@ GLOBAL_DATUM(hud_icon_hudfocus, /image)
 		holder.overlays += GLOB.hud_icon_hudfocus
 	hud_list[ORDER_HUD] = holder
 
+/mob/proc/hud_set_holocard()
+	return
 
+// HOLOCARD HUD
+/mob/living/carbon/human/hud_set_holocard()
+	var/image/holder = hud_list[HOLOCARD_HUD]
+	holder.icon_state = holo_card_color ? "holo_card_[holo_card_color]" : "hudblank"
 
 // Xeno "hostile" HUD
 /mob/living/carbon/human/proc/update_xeno_hostile_hud()

code/game/area/BigRed.dm

@@ -1,4 +1,5 @@
 //Areas for BigRed - Minijar
+// old icon state no longer in use. ("hydro","heads_quarters")
 /area/bigred
 	can_build_special = TRUE
 	powernet_name = "ground"
@@ -251,44 +252,50 @@
 	name = "\improper Corporate Saferoom"
 	icon_state = "vault"
 
-/area/bigred/uground/lambda_labs/
-	minimap_color = MINIMAP_AREA_RESEARCH_CAVE
-/area/bigred/uground/lambda_labs/airlock
-	name = "\improper Lambda Labs Airlock"
-	icon_state = "decontamination"
-
-/area/bigred/uground/lambda_labs/lobby
-	name = "\improper Lambda Labs Reception"
-	icon_state = "bluenew"
-
-/area/bigred/uground/lambda_labs/office
-	name = "\improper Lambda Labs Administration"
-	icon_state = "heads_quarters"
+// Lambda areas below:
 
-/area/bigred/uground/lambda_labs/laser_lab
-	name = "\improper Lambda Laser Laboratory"
-	icon_state = "toxmisc"
+// Laboratory proper
+/area/bigredv2/caves/lambda
+	ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS
+	ceiling_muffle = FALSE
+	ambience_exterior = AMBIENCE_ALMAYER
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+	soundscape_playlist = list()
+	minimap_color = MINIMAP_AREA_RESEARCH
 
-/area/bigred/uground/lambda_labs/hydro_office
-	name = "\improper Lambda Labs Bio-Dome"
-	icon_state = "hydro"
+/area/bigredv2/caves/lambda/virology
+	name = "\improper Lambda Virology"
+	icon_state = "lam_virology"
 
-/area/bigred/uground/lambda_labs/hydro_lab
-	name = "\improper Lambda Labs Hydrophonics"
-	icon_state = "garden"
+/area/bigredv2/caves/lambda/research
+	name = "\improper Lambda Research"
+	icon_state = "lam_research"
 
-/area/bigred/uground/lambda_labs/fridge
-	name = "\improper Lambda Labs Refrigeration"
-	icon_state = "kitchen"
+/area/bigredv2/caves/lambda/breakroom
+	name = "\improper Lambda Breakroom"
+	icon_state = "lam_break"
 
-/area/bigred/uground/lambda_labs/maintenance
-	name = "\improper Unknown Area"
-	icon_state = "yellow"
+/area/bigredv2/caves/lambda/xenobiology
+	name = "\improper Lambda Xenobiology"
+	icon_state = "lam_xeno"
 
-/area/bigred/uground/lambda_labs/maintenance2
-	name = "\improper Unknown Area"
-	icon_state = "blue"
+// cave around the laboratory.
+/area/bigredv2/caves_lambda
+	name = "\improper Lambda Lab Caves"
+	icon_state = "caves_lambda"
+	ceiling = CEILING_UNDERGROUND_BLOCK_CAS
+	sound_environment = SOUND_ENVIRONMENT_AUDITORIUM
+	ceiling_muffle = FALSE
+	ambience_exterior = AMBIENCE_CAVE
+	soundscape_playlist = SCAPE_PL_CAVE
+	base_muffle = MUFFLE_HIGH
 
+// serve for the security checkpoint.
+/area/bigredv2/outside/lambda_cave_cas
+	name = "\improper Lambda Lockdown Caves Entrance"
+	icon_state = "decontamination"
+	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	minimap_color = MINIMAP_AREA_SEC
 
 //Big Red V2
 /area/bigredv2
@@ -551,29 +558,6 @@
 	icon_state = "party"
 	ceiling = CEILING_METAL
 
-/area/bigredv2/caves/lambda
-	ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS
-	ceiling_muffle = FALSE
-	ambience_exterior = AMBIENCE_ALMAYER
-	sound_environment = SOUND_ENVIRONMENT_ROOM
-	soundscape_playlist = list()
-
-/area/bigredv2/caves/lambda/virology
-	name = "\improper Lambda Virology"
-	icon_state = "lam_virology"
-
-/area/bigredv2/caves/lambda/research
-	name = "\improper Lambda Research"
-	icon_state = "lam_research"
-
-/area/bigredv2/caves/lambda/breakroom
-	name = "\improper Lambda Breakroom"
-	icon_state = "lam_break"
-
-/area/bigredv2/caves/lambda/xenobiology
-	name = "\improper Lambda Xenobiology"
-	icon_state = "lam_xeno"
-
 /area/bigredv2/outside/general_offices
 	name = "\improper General Offices"
 	icon_state = "storage"
@@ -630,16 +614,6 @@
 	soundscape_playlist = SCAPE_PL_CAVE
 	base_muffle = MUFFLE_HIGH
 
-/area/bigredv2/caves_lambda
-	name = "\improper Lambda Lab Caves"
-	icon_state = "caves_lambda"
-	ceiling = CEILING_UNDERGROUND_BLOCK_CAS
-	sound_environment = SOUND_ENVIRONMENT_AUDITORIUM
-	ceiling_muffle = FALSE
-	ambience_exterior = AMBIENCE_CAVE
-	soundscape_playlist = SCAPE_PL_CAVE
-	base_muffle = MUFFLE_HIGH
-
 /area/bigredv2/caves_north
 	name = "\improper Northern Caves"
 	icon_state = "caves_north"
@@ -688,8 +662,3 @@
 	name = "\improper Filtration Lockdown Caves Entrance"
 	icon_state = "garden"
 	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
-
-/area/bigredv2/outside/lambda_cave_cas
-	name = "\improper Lambda Lockdown Caves Entrance"
-	icon_state = "garden"
-	ceiling = CEILING_UNDERGROUND_ALLOW_CAS

code/game/area/LV624.dm

@@ -37,6 +37,7 @@
 	name ="\improper Western Jungle"
 	icon_state = "west"
 	//ambience = list('sound/ambience/jungle_amb1.ogg')
+	is_resin_allowed = FALSE
 
 /area/lv624/ground/jungle/west_jungle/ceiling
 	ceiling = CEILING_GLASS

code/game/gamemodes/colonialmarines/colonialmarines.dm

@@ -332,7 +332,7 @@
 			if(HS.living_xeno_queen && !should_block_game_interaction(HS.living_xeno_queen.loc))
 				//Some Queen is alive, we shouldn't end the game yet
 				return
-		if (HS.totalXenos <= 3)
+		if(length(HS.totalXenos) <= 3)
 			round_finished = MODE_INFESTATION_M_MAJOR
 		else
 			round_finished = MODE_INFESTATION_M_MINOR

code/game/machinery/camera/camera.dm

@@ -10,7 +10,6 @@
 
 	var/list/network = list(CAMERA_NET_MILITARY)
 	var/c_tag = null
-	var/c_tag_order = 999
 	var/status = 1
 	anchored = TRUE
 	var/panel_open = FALSE // 0 = Closed / 1 = Open

code/game/objects/items/props/helmetgarb.dm

@@ -450,6 +450,9 @@
 	shape = NVG_SHAPE_COSMETIC
 	garbage = TRUE
 
+/obj/item/prop/helmetgarb/helmet_nvg/cosmetic/break_nvg(mob/living/carbon/human/user, list/slashdata, mob/living/carbon/xenomorph/Xeno)
+	return
+
 /obj/item/prop/helmetgarb/helmet_nvg/marsoc //for Marine Raiders
 	name = "\improper Tactical M3 night vision goggles"
 	desc = "With an integrated self-recharging battery, nothing can stop you. Put them on your helmet and press the button and it's go-time."

code/game/objects/items/storage/backpack.dm

@@ -125,6 +125,9 @@
 	..()
 
 /obj/item/storage/backpack/proc/is_accessible_by(mob/user)
+	// If the user is already looking inside this backpack.
+	if(user.s_active == src)
+		return TRUE
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		if(!worn_accessible)

code/game/objects/items/tools/experimental_tools.dm

@@ -157,7 +157,7 @@
 		end_cpr()
 		return PROCESS_KILL
 
-	if(world.time > last_pump + 10 SECONDS)
+	if(world.time > last_pump + 7.5 SECONDS)
 		last_pump = world.time
 		if(H.stat == UNCONSCIOUS)
 			var/suff = min(H.getOxyLoss(), 10) //Pre-merge level, less healing, more prevention of dying.

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -166,11 +166,14 @@
 		if(ismob(G.grabbed_thing))
 			var/mob/M = G.grabbed_thing
 			var/atom/blocker = LinkBlocked(user, user.loc, loc)
+			if(!Adjacent(M))
+				visible_message(SPAN_DANGER("[M] is too far to place onto [src]."))
+				return FALSE
 			if(blocker)
 				to_chat(user, SPAN_WARNING("\The [blocker] is in the way!"))
-			else
-				to_chat(user, SPAN_NOTICE("You place [M] on [src]."))
-				M.forceMove(loc)
+				return FALSE
+			to_chat(user, SPAN_NOTICE("You place [M] on [src]."))
+			M.forceMove(loc)
 		return TRUE
 
 	else