Merge branch 'master' into hivelord_whisperer_normalize

cmss13-devs · Jan 4, 2025 · a93e4f5 · a93e4f5
2 parents 0b4f25c + 6508634
commit a93e4f5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/code/game/machinery/computer/dropship_weapons.dm b/code/game/machinery/computer/dropship_weapons.dm
@@ -438,6 +438,9 @@
 			return TRUE
 
 		if("nvg-enable")
+			if(upgraded != MATRIX_NVG)
+				to_chat(user, SPAN_WARNING("The matrix is not upgraded with night vision."))
+				return FALSE
 			SEND_SIGNAL(src, COMSIG_CAMERA_SET_NVG, 5, "#7aff7a")
 			return TRUE
 

diff --git a/code/modules/gear_presets/cia.dm b/code/modules/gear_presets/cia.dm
@@ -15,7 +15,7 @@
 	name = "CIA Agent (Civilian Clothing)"
 	rank = "Intelligence Analyst"
 	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
-	role_comm_title = PAY_SHORT_CIV
+	role_comm_title = "CIV"
 	minimap_background = "background_civillian"
 	minimap_icon = "io"
 	idtype = /obj/item/card/id/adaptive

diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm
@@ -7,6 +7,7 @@
 	faction = FACTION_COLONIST
 	languages = list()
 	access = list(ACCESS_CIVILIAN_PUBLIC)
+	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
 	skills = /datum/skills/civilian
 	idtype = /obj/item/card/id/lanyard
 	var/xenovictim = FALSE //Set to true to make the corpse spawn as a victim of a xeno burst
@@ -95,6 +96,7 @@
 	idtype = /obj/item/card/id/silver/clearance_badge
 	xenovictim = TRUE
 	access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY)
+	paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/corpse/doctor/load_gear(mob/living/carbon/human/new_human)
 	add_ice_colony_survivor_equipment(new_human)
@@ -138,6 +140,7 @@
 	idtype = /obj/item/card/id/silver/clearance_badge/scientist
 	xenovictim = TRUE
 	access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY)
+	paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/corpse/scientist/load_gear(mob/living/carbon/human/new_human)
 	add_ice_colony_survivor_equipment(new_human)
@@ -182,6 +185,7 @@
 	assignment = "Security Officer"
 	xenovictim = TRUE
 	access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND)
+	paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/corpse/security/load_gear(mob/living/carbon/human/new_human)
 	add_ice_colony_survivor_equipment(new_human)
@@ -326,6 +330,7 @@
 		ACCESS_CIVILIAN_MEDBAY,
 		ACCESS_CIVILIAN_COMMAND,
 	)
+	paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/corpse/prison_guard/load_gear(mob/living/carbon/human/new_human)
 	add_ice_colony_survivor_equipment(new_human)
@@ -444,6 +449,7 @@
 		ACCESS_WY_COLONIAL,
 		ACCESS_WY_GENERAL,
 	)
+	paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/corpse/wysec/load_gear(mob/living/carbon/human/new_human)
 	add_ice_colony_survivor_equipment(new_human)
@@ -611,6 +617,7 @@
 	idtype = /obj/item/card/id/data
 	rank = JOB_CLF
 	faction = FACTION_CLF
+	paygrades = list(PAY_SHORT_REB = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/corpse/clf/New()
 	. = ..()
@@ -1443,6 +1450,7 @@
 	assignment = "Civilian - Medical Doctor"
 	idtype = /obj/item/card/id/silver/clearance_badge
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
+	paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/corpse/hybrisa/medical_doctor_corpse/load_gear(mob/living/carbon/human/new_human)
 
@@ -1480,6 +1488,7 @@
 	assignment = "Xenobiologist"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 	idtype = /obj/item/card/id/silver/clearance_badge/scientist
+	paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/corpse/hybrisa/scientist_xenobiologist/load_gear(mob/living/carbon/human/new_human)
 	var/random_gear = rand(1,50)
@@ -1518,6 +1527,7 @@
 	assignment = "Xenoarchaeologist"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 	idtype = /obj/item/card/id/silver/clearance_badge/scientist
+	paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0)
 
 /datum/equipment_preset/corpse/hybrisa/scientist_xenoarchaeologist/load_gear(mob/living/carbon/human/new_human)
 	var/random_gear = rand(1,55)

diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm
@@ -565,6 +565,7 @@
 	assignment = "Pizza Deliverer"
 	rank = FACTION_PIZZA
 	skills = /datum/skills/civilian
+	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
 	faction = FACTION_PIZZA
 
 /datum/equipment_preset/other/pizza/New()