Merge pull request #5276 from MistakeNot4892/misc_polaris_changes

out-of-phaze · web-flow · commit 17c1f609aefa · 2026-01-26T06:30:02.000-05:00
Misc Polneb changes
diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm
@@ -42,28 +42,27 @@ var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called
 
 // Camera channels
 // Station channels
-#define CAMERA_CHANNEL_PUBLIC "Public"
-#define CAMERA_CHANNEL_ENGINEERING "Engineering"
-#define CAMERA_CHANNEL_MEDICAL "Medical"
-#define CAMERA_CHANNEL_RESEARCH "Research"
-#define CAMERA_CHANNEL_SECURITY "Security"
-
-#define CAMERA_CHANNEL_ROBOTS "Robots"
-#define CAMERA_CHANNEL_MINE "Mining"
-#define CAMERA_CHANNEL_SECRET "Secret"
+#define CAMERA_CHANNEL_PUBLIC              "Public"
+#define CAMERA_CHANNEL_ENGINEERING         "Engineering"
+#define CAMERA_CHANNEL_MEDICAL             "Medical"
+#define CAMERA_CHANNEL_RESEARCH            "Research"
+#define CAMERA_CHANNEL_SECURITY            "Security"
+#define CAMERA_CHANNEL_ROBOTS              "Robots"
+#define CAMERA_CHANNEL_MINE                "Mining"
+#define CAMERA_CHANNEL_SECRET              "Secret"
 
 // Non-station channels
-#define CAMERA_CHANNEL_CRESCENT "Crescent"
-#define CAMERA_CHANNEL_ERT "ZeEmergencyResponseTeam"
-#define CAMERA_CHANNEL_MERCENARY "MercurialNet"
-#define CAMERA_CHANNEL_TELEVISION "Television"
+#define CAMERA_CHANNEL_CRESCENT            "Crescent"
+#define CAMERA_CHANNEL_ERT                 "Emergency Response Team"
+#define CAMERA_CHANNEL_MERCENARY           "MercurialNet"
+#define CAMERA_CHANNEL_TELEVISION          "Television"
 
 // Alarm networks
-#define NETWORK_ALARM_ATMOS "Atmosphere Alarms"
+#define NETWORK_ALARM_ATMOS  "Atmosphere Alarms"
 #define NETWORK_ALARM_CAMERA "Camera Alarms"
-#define NETWORK_ALARM_FIRE "Fire Alarms"
+#define NETWORK_ALARM_FIRE   "Fire Alarms"
 #define NETWORK_ALARM_MOTION "Motion Alarms"
-#define NETWORK_ALARM_POWER "Power Alarms"
+#define NETWORK_ALARM_POWER  "Power Alarms"
 
 //singularity defines
 #define STAGE_ONE 	1
diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
@@ -270,3 +270,7 @@
 
 /decl/outfit/dd_SortValue()
 	return name
+
+// Stub for the sake of being able to make people spawn nude.
+/decl/outfit/naked
+	name = "Naked And Afraid"
diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm
@@ -10,8 +10,9 @@
 	anchored = TRUE
 	obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
 	directional_offset = @'{"NORTH":{"y":-32}, "SOUTH":{"y":32}, "EAST":{"x":32}, "WEST":{"x":-32}}'
-	var/lit = 0
+	var/lit = FALSE
 	var/on_icon = "sign_on"
+	var/sign_light_color = COLOR_CYAN_BLUE
 
 	uncreated_component_parts = list(
 		/obj/item/stock_parts/radio/receiver,
@@ -33,11 +34,11 @@
 
 /obj/machinery/holosign/on_update_icon()
 	if (!lit || inoperable())
-		icon_state = "sign_off"
+		icon_state = initial(icon_state)
 		set_light(0)
 	else
 		icon_state = on_icon
-		set_light(1, 0.5, COLOR_CYAN_BLUE)
+		set_light(1, 0.5, sign_light_color)
 
 /decl/public_access/public_variable/holosign_on
 	expected_type = /obj/machinery/holosign
@@ -68,6 +69,13 @@
 	desc = "Small wall-mounted holographic projector. This one reads SERVICE."
 	on_icon = "service"
 
+/obj/machinery/holosign/bar
+	name = "bar holosign"
+	desc = "Small wall-mounted holographic projector. This one reads OPEN."
+	icon_state = "barclosed"
+	on_icon = "baropen"
+	sign_light_color = COLOR_LIGHT_CYAN
+
 ////////////////////SWITCH///////////////////////////////////////
 /obj/machinery/button/holosign
 	name = "holosign switch"
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
@@ -453,3 +453,16 @@ var/global/list/all_gps_units = list()
 		"stripe-outside" = "#ffae00",
 		"stripe-inside" =  "#9e7900"
 	)
+
+/obj/item/gps/security
+	color = "#5c0000"
+	decals = list(
+		"stripe-outside" = "#ff0000",
+		"stripe-inside" =  "#800000"
+	)
+
+/obj/item/gps/security/hos
+	decals = list(
+		"stripe-outside" = "#ffae00",
+		"stripe-inside" =  "#9e7900"
+	)
diff --git a/code/game/objects/items/weapons/material/ashtray.dm b/code/game/objects/items/weapons/material/ashtray.dm
@@ -58,3 +58,6 @@
 
 /obj/item/ashtray/glass
 	material = /decl/material/solid/glass
+
+/obj/item/ashtray/bronze
+	material = /decl/material/solid/metal/bronze
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
@@ -166,6 +166,17 @@
 /obj/item/box/ammo/blanks/WillContain()
 	return list(/obj/item/ammo_casing/shotgun/blank = 8)
 
+/obj/item/box/ammo/blanks/large
+	icon_state = "largebox"
+	w_class = ITEM_SIZE_LARGE
+
+/obj/item/box/ammo/blanks/large/Initialize(ml, material_key)
+	. = ..()
+	storage.make_exact_fit()
+
+/obj/item/box/ammo/blanks/large/WillContain()
+	return list(/obj/item/ammo_casing/shotgun/blank = 16)
+
 /obj/item/box/ammo/practiceshells
 	name = "box of practice shells"
 /obj/item/box/ammo/practiceshells/WillContain()
diff --git a/code/game/objects/random/subtypes/misc.dm b/code/game/objects/random/subtypes/misc.dm
@@ -54,6 +54,16 @@
 	)
 	return spawnable_choices
 
+/obj/random/mug
+	name = "random coffee cup"
+	desc = "A random coffee cup/mug."
+	icon = 'icons/obj/drink_glasses/coffecup.dmi'
+	icon_state = "coffeecup"
+
+/obj/random/mug/spawn_choices()
+	var/static/list/spawnable_choices = typesof(/obj/item/chems/drinks/glass2/coffeecup) - /obj/item/chems/drinks/glass2/coffeecup/custom
+	return spawnable_choices
+
 /obj/random/drinkbottle
 	name = "random drink"
 	desc = "This is a random drink."
diff --git a/code/game/turfs/floors/subtypes/floor_circuit.dm b/code/game/turfs/floors/subtypes/floor_circuit.dm
@@ -13,6 +13,10 @@
 	name        = "mainframe base" // TODO: force name overriding flooring?
 	temperature = 263
 
+/turf/floor/bluegrid/cryo
+	initial_gas = list(/decl/material/gas/nitrogen = MOLES_CELLSTANDARD)
+	temperature = -200 CELSIUS
+
 /turf/floor/greengrid
 	name        = "mainframe floor"
 	icon        = 'icons/turf/flooring/circuit.dmi'
diff --git a/code/game/turfs/floors/subtypes/floor_tiled.dm b/code/game/turfs/floors/subtypes/floor_tiled.dm
@@ -10,6 +10,10 @@
 	icon_state    = "dark"
 	_flooring     = /decl/flooring/tiling/dark
 
+/turf/floor/tiled/dark/cryo
+	initial_gas = list(/decl/material/gas/nitrogen = MOLES_CELLSTANDARD)
+	temperature = -200 CELSIUS
+
 /turf/floor/tiled/dark/monotile
 	name          = "floor"
 	icon_state    = "monotiledark"
@@ -68,6 +72,10 @@
 	icon_state    = "techfloor_gray"
 	_flooring     = /decl/flooring/tiling/tech
 
+/turf/floor/tiled/techfloor/cryo
+	initial_gas = list(/decl/material/gas/nitrogen = MOLES_CELLSTANDARD)
+	temperature = -200 CELSIUS
+
 /turf/floor/tiled/monotile
 	name          = "floor"
 	icon_state    = "steel_monotile"
@@ -108,6 +116,10 @@
 	icon_state    = "techfloor_grid"
 	_flooring     = /decl/flooring/tiling/tech/grid
 
+/turf/floor/tiled/techfloor/grid/cryo
+	initial_gas = list(/decl/material/gas/nitrogen = MOLES_CELLSTANDARD)
+	temperature = -200 CELSIUS
+
 /turf/floor/tiled/airless
 	name          = "airless floor"
 	initial_gas   = null
diff --git a/code/game/turfs/walls/wall_natural.dm b/code/game/turfs/walls/wall_natural.dm
@@ -236,4 +236,4 @@ var/global/_wall_chisel_skill = SKILL_CONSTRUCTION
 		if(length(S.base_materials))
 			return pick(S.base_materials)
 	//Otherwise, just use level strata
-	return ..()
+	return ..()
diff --git a/code/modules/clothing/masks/smokable.dm b/code/modules/clothing/masks/smokable.dm
@@ -135,9 +135,10 @@
 			return
 		lit = TRUE
 		atom_damage_type = BURN
-		if(REAGENT_VOLUME(reagents, /decl/material/liquid/fuel)) // the fuel explodes
+		var/explosive_power = istype(reagents) && reagents.get_explosive_power()
+		if(explosive_power > 0)
 			var/datum/effect/effect/system/reagents_explosion/e = new()
-			e.set_up(round(REAGENT_VOLUME(reagents, /decl/material/liquid/fuel) / 5, 1), get_turf(src), 0, 0)
+			e.set_up(explosive_power, get_turf(src), 0, 0)
 			e.start()
 			qdel(src)
 			return
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -64,6 +64,9 @@
 		/obj/item/rig_module/cooling_unit
 		)
 
+/obj/item/rig/light/hacker/unlocked
+	req_access = null
+
 //The cybersuit is not space-proof. It does however, have good siemens_coefficient values
 /obj/item/clothing/head/lightrig/hacker
 	name = "HUD"
@@ -90,3 +93,6 @@
 		/obj/item/rig_module/stealth_field,
 		/obj/item/rig_module/vision
 	)
+
+/obj/item/rig/light/stealth/unlocked
+	req_access = null
diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm
@@ -44,6 +44,9 @@
 /obj/item/clothing/suit/space/rig/merc
 	icon = 'icons/clothing/rigs/chests/chest_merc.dmi'
 
+/obj/item/rig/merc/empty/unlocked
+	req_access = null
+
 //Has most of the modules removed
 /obj/item/rig/merc/empty
 	initial_modules = list(
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -81,6 +81,9 @@
 	icon = 'icons/clothing/rigs/gloves/gloves.dmi'
 	siemens_coefficient = 0
 
+/obj/item/rig/industrial/unlocked
+	req_access = null
+
 /obj/item/rig/industrial/equipped
 
 	initial_modules = list(
@@ -118,6 +121,9 @@
 
 	req_access = list(access_engine_equip)
 
+/obj/item/rig/eva/unlocked
+	req_access = null
+
 /obj/item/clothing/head/helmet/space/rig/eva
 	camera = /obj/machinery/camera/network/engineering
 	icon = 'icons/clothing/rigs/helmets/helmet_eva.dmi'
@@ -338,6 +344,9 @@
 	allowed = list(/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/handcuffs,/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/baton)
 	anomaly_shielding = 1
 
+/obj/item/rig/hazard/unlocked
+	req_access = null
+
 /obj/item/clothing/head/helmet/space/rig/hazard
 	camera = /obj/machinery/camera/network/security
 	icon = 'icons/clothing/rigs/helmets/helmet_hazard.dmi'
diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm
@@ -194,6 +194,14 @@
 		return
 	if(!can_ignite())
 		return
+	//also copied from matches
+	var/explosive_power= istype(reagents) && reagents.get_explosive_power()
+	if(explosive_power > 0)
+		var/datum/effect/effect/system/reagents_explosion/e = new()
+		e.set_up(explosive_power, get_turf(src), 0, 0)
+		e.start()
+		qdel(src)
+		return
 	START_PROCESSING(SSobj, src)
 	set_light(2, 1, "#e38f46")
 	_on_fire = TRUE
diff --git a/code/modules/materials/_materials.dm b/code/modules/materials/_materials.dm
@@ -255,7 +255,8 @@ var/global/list/materials_by_gas_symbol = list()
 	var/burn_temperature = 100 CELSIUS
 	var/burn_product
 	var/list/vapor_products // If splashed, releases these gasses in these proportions. // TODO add to unit test after solvent PR is merged
-
+	/// A divisor applied to volume when calculating explosive force (lower is stronger) - if null, reagent is no explosive
+	var/explosive_power_divisor
 	var/scent //refer to _scent.dm
 	var/scent_intensity = /decl/scent_intensity/normal
 	var/scent_descriptor = "smell"
diff --git a/code/modules/mob/living/human/descriptors/descriptors_body_length.dm b/code/modules/mob/living/human/descriptors/descriptors_body_length.dm
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
@@ -1018,3 +1018,10 @@ var/global/datum/reagents/sink/infinite_reagent_sink = new
 	if(!istype(reagent))
 		return FALSE
 	return TRUE
+
+/datum/reagents/proc/get_explosive_power()
+	for(var/decl/material/mat in reagent_volumes)
+		if(isnull(mat.explosive_power_divisor))
+			continue
+		. += (reagent_volumes[mat] / mat.explosive_power_divisor)
+	. = round(., 1)
diff --git a/code/modules/reagents/chems/chems_medicines.dm b/code/modules/reagents/chems/chems_medicines.dm
@@ -30,10 +30,11 @@
 	value = 1.5
 	exoplanet_rarity_gas = MAT_RARITY_EXOTIC
 	uid = "chem_antirads"
+	var/antirad_power = 30
 
 /decl/material/liquid/antirads/affect_blood(var/mob/living/M, var/removed, var/datum/reagents/holder)
 	. = ..()
-	M.radiation = max(M.radiation - 30 * removed, 0)
+	M.radiation = max(M.radiation - antirad_power * removed, 0)
 
 /decl/material/liquid/brute_meds
 	name = "styptic powder"
diff --git a/code/modules/reagents/cocktails.dm b/code/modules/reagents/cocktails.dm
@@ -226,7 +226,7 @@
 	)
 
 /decl/cocktail/toxins_special
-	name = "H2 Special"
+	name = "Toxins Special"
 	description = "Raise a glass to the bomb technicians of yesteryear, wherever their ashes now reside."
 	ratios = list(
 		/decl/material/liquid/alcohol/rum = 1,
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
@@ -383,6 +383,14 @@
 	add_to_reagents(/decl/material/liquid/amphetamines, 2 * vol_third)
 	return ..()
 
+/obj/item/chems/syringe/brute_meds
+	desc = "Contains drugs for treating brute trauma."
+	mode = SYRINGE_INJECT
+
+/obj/item/chems/syringe/brute_meds/populate_reagents()
+	add_to_reagents(/decl/material/liquid/brute_meds, REAGENT_MAXIMUM_VOLUME(reagents))
+	return ..()
+
 // TG ports
 
 /obj/item/chems/syringe/advanced
diff --git a/code/modules/xenoarcheaology/artifacts/standalone/gigadrill.dm b/code/modules/xenoarcheaology/artifacts/standalone/gigadrill.dm
@@ -12,6 +12,10 @@
 	var/active = 0
 	var/drill_time = 10
 	var/turf/drilling_turf
+	matter = list(
+		/decl/material/solid/metal/plasteel/ocp = MATTER_AMOUNT_PRIMARY,
+		/decl/material/solid/gemstone/diamond = MATTER_AMOUNT_REINFORCEMENT,
+	)
 
 /obj/machinery/giga_drill/physical_attack_hand(mob/user)
 	if(active)
diff --git a/icons/obj/holosign.dmi b/icons/obj/holosign.dmi
diff --git a/maps/away/errant_pisces/errant_pisces.dm b/maps/away/errant_pisces/errant_pisces.dm
@@ -180,9 +180,9 @@
 
 /obj/abstract/landmark/corpse/carp_fisher
 	name = "carp fisher"
-	corpse_outfits = list(/decl/outfit/corpse/carp_fisher)
+	corpse_outfits = list(/decl/outfit/corpse_carp_fisher)
 
-/decl/outfit/corpse/carp_fisher
+/decl/outfit/corpse_carp_fisher
 	name = "Dead carp fisher"
 	uniform = /obj/item/clothing/jumpsuit/green
 	suit = /obj/item/clothing/suit/apron/overalls
diff --git a/mods/content/corporate/away_sites/lar_maria/lar_maria.dm b/mods/content/corporate/away_sites/lar_maria/lar_maria.dm
diff --git a/mods/species/ascent/_ascent.dme b/mods/species/ascent/_ascent.dme
diff --git a/nebula.dme b/nebula.dme
