ss220-space · Pelmenik123 · Dec 1, 2024 · Dec 8, 2024 · Dec 8, 2024 · Dec 8, 2024
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -149,3 +149,5 @@
 #define TAIPAN_HUD_COMMS 		7
 #define TAIPAN_HUD_RD			8
 #define TAIPAN_HUD_CYBORG		9
+
+#define PRIMITIVE_STATION_DEPARTMENTS list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Support", "Civilian")
diff --git a/code/controllers/subsystem/capitalism.dm b/code/controllers/subsystem/capitalism.dm
@@ -86,7 +86,7 @@ SUBSYSTEM_DEF(capitalism)
 		create_station_account()
 
 	if(GLOB.department_accounts.len == 0)
-		for(var/department in GLOB.station_departments)
+		for(var/department in PRIMITIVE_STATION_DEPARTMENTS)
 			create_department_account(department)
 
 /datum/controller/subsystem/capitalism/proc/salary_account_init()

diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
@@ -154,7 +154,7 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
 
 		var/datum/job/prom_job = SSjobs.GetJob(H.job)
 
-		for(var/dep_flag in prom_job.college_department) //:catsmile:
+		for(var/dep_flag in prom_job.colleagues_department) //:catsmile:
 			if(!isnull(GLOB.capitalist_manifest?[dep_flag]))
 				GLOB.capitalist_manifest[dep_flag][prom_voice] = H.real_name
 			else

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
@@ -36,7 +36,11 @@
 
 	var/assigned_role //assigned role is what job you're assigned to when you join the station.
 	var/playtime_role //if set, overrides your assigned_role for the purpose of playtime awards. Set by IDcomputer when your ID is changed.
+<<<<<<< HEAD
+	var/special_role //special roles are typically reserved for antags or roles like ETP. If you want to avoid a character being automatically announced by the AI, on arrival (becuase they're an off station character or something); ensure that special_role and assigned_role are equal.
+=======
 	var/special_role //special roles are typically reserved for antags or roles like ERT. If you want to avoid a character being automatically announced by the AI, on arrival (becuase they're an off station character or something); ensure that special_role and assigned_role are equal.
+>>>>>>> caf3822d618309788ab476e00d70a0522fe62334
 	var/special_role_meta_know = FALSE
 	var/offstation_role = FALSE //set to true for ERT, deathsquad, abductors, etc, that can go from and to z2 at will and shouldn't be antag targets
 	var/list/restricted_roles = list()

diff --git a/code/datums/voice.dm b/code/datums/voice.dm
@@ -1,4 +1,4 @@
-#define GENDER_NAME_UNKNOWN  list(MALE = "Неизвестный", FEMALE = "Неизвестная", NEUTER = "Неизвестный", PLURAL  = "Неизвестный")
+#define GENDER_NAME_UNKNOWN  list(MALE = "Неизвестный", FEMALE = "Неизвестная", NEUTER = "Неизвестный", PLURAL  = "Неизвестные")
 //Voice cumponent
 /datum/component/voice_model
 	var/mob/host = null
@@ -73,14 +73,15 @@
 				return t.fields["name"]
 	return "IDENTIFICATION ERROR"
 
-/* not used
+/* Not used
 /datum/component/voice_model/proc/GetManifestKnowFace(mob/face_target)
 	for(var/datum/data/record/t in GLOB.data_core.general)
 		if(t)
 			if(t.fields["name"] == face_target.name)
 				return t.fields["name"]
 	return "IDENTIFICATION FACE ERROR"
 */
+
 /datum/component/voice_model/proc/try_store(mob/source, mob/target)
 	SIGNAL_HANDLER
 	if(target == source)
@@ -110,9 +111,7 @@
 		. = TRUE
 	return
 
-//For examie
-// FUCKING BYOND
-/* NOT USED
+/* Not used
 /datum/component/voice_model/proc/TryRecollectFace(mob/target)
 	if(src == target.adv_voice)
 		return target.name
@@ -132,6 +131,7 @@
 		. = get_gender_unknown_name(target_H.gender)
 	return
 */
+
 //For hear
 /datum/component/voice_model/proc/try_recollect_voice(mob/target)
 	if(!ishuman(host))
@@ -158,7 +158,7 @@
 	return FALSE
 
 //HELPERS 
-/proc/GenDepartamentVoiceTree(mob/target, list/departments)
+/proc/gen_departament_voice_tree(mob/target, list/departments)
 	var/list/result = list()
 
 	for(var/dep_flag in departments)

diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
@@ -330,7 +330,10 @@ structure_check() searches for nearby cultist structures required for the invoca
 								"<span class='cultlarge'><i>AAAAAAAAAAAAAA-</i></span>")
 		SSticker.mode.add_cultist(convertee.mind)
 		convertee.mind.special_role = "Cultist"
+<<<<<<< HEAD
+=======
 		//convertee.mind.special_role_meta_know = TRUE
+>>>>>>> caf3822d618309788ab476e00d70a0522fe62334
 		to_chat(convertee, "<span class='cultitalic'><b>Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \
 		and something evil takes root.</b></span>")
 		to_chat(convertee, "<span class='cultitalic'><b>Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve [SSticker.cultdat.entity_title3] above all else. Bring it back.\

diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
@@ -1,4 +1,3 @@
-#define PRIMITIVE_STATION_DEPARTMENTS list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Support", "Civilian")
 /datum/job/chief_engineer
 	title = JOB_TITLE_CHIEF
 	flag = JOB_FLAG_CHIEF
@@ -30,7 +29,7 @@
 	max_start_money = 700
 
 	default_dep  = FALSE
-	college_department = PRIMITIVE_STATION_DEPARTMENTS
+	colleagues_department= PRIMITIVE_STATION_DEPARTMENTS
 
 /datum/outfit/job/chief_engineer
 	name = "Chief Engineer"

diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
@@ -81,11 +81,11 @@
 	var/insurance_type = INSURANCE_TYPE_STANDART
 
 	var/default_dep  = TRUE
-	var/list/college_department = list()
+	var/list/colleagues_department = list()
 
 /datum/job/New()
-	if(department && default_dep )
-		LAZYADD(college_department, department)
+	if(department && default_dep)
+		LAZYADD(colleagues_department, department)
 
 //Only override this proc
 /datum/job/proc/after_spawn(mob/living/carbon/human/H)

diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
@@ -27,7 +27,7 @@
 	max_start_money = 700
 
 	default_dep  = FALSE
-	college_department = PRIMITIVE_STATION_DEPARTMENTS
+	colleagues_department= PRIMITIVE_STATION_DEPARTMENTS
 
 /datum/outfit/job/cmo
 	name = JOB_TITLE_CMO
@@ -264,7 +264,7 @@
 	min_start_money = 200
 	max_start_money = 400
 
-	college_department = list("Medical", "Science")
+	colleagues_department= list("Medical", "Science")
 
 /datum/outfit/job/geneticist
 	name = "Geneticist"

diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
@@ -33,7 +33,7 @@
 	max_start_money = 700
 
 	default_dep  = FALSE
-	college_department = PRIMITIVE_STATION_DEPARTMENTS
+	colleagues_department= PRIMITIVE_STATION_DEPARTMENTS
 
 /datum/outfit/job/rd
 	name = "Research Director"

diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
@@ -31,7 +31,7 @@
 	max_start_money = 700
 
 	default_dep  = FALSE
-	college_department = PRIMITIVE_STATION_DEPARTMENTS
+	colleagues_department= PRIMITIVE_STATION_DEPARTMENTS
 
 /datum/outfit/job/hos
 	name = "Head of Security"
@@ -274,7 +274,7 @@
 	min_start_money = 200
 	max_start_money = 550
 
-	college_department = list("Security", "Medical") //:catsmile:
+	colleagues_department= list("Security", "Medical") //:catsmile:
 
 /datum/outfit/job/brigdoc
 	name = "Brig Physician"

diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
@@ -26,7 +26,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 	max_start_money = 1200
 
 	default_dep  = FALSE
-	college_department = PRIMITIVE_STATION_DEPARTMENTS
+	colleagues_department= PRIMITIVE_STATION_DEPARTMENTS
 
 /datum/job/captain/get_access()
 	return get_all_accesses()
@@ -100,7 +100,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 	max_start_money = 700
 
 	default_dep  = FALSE
-	college_department = PRIMITIVE_STATION_DEPARTMENTS
+	colleagues_department= PRIMITIVE_STATION_DEPARTMENTS
 
 /datum/outfit/job/hop
 	name = "Head of Personnel"
@@ -208,7 +208,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
 	min_start_money = 400
 	max_start_money = 700
 
-	college_department = list("Command", "Security")
+	colleagues_department= list("Command", "Security")
 
 /datum/outfit/job/blueshield
 	name = "Blueshield"

diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
@@ -24,7 +24,7 @@
 	max_start_money = 700
 
 	default_dep  = FALSE
-	college_department = PRIMITIVE_STATION_DEPARTMENTS
+	colleagues_department= PRIMITIVE_STATION_DEPARTMENTS
 
 /datum/outfit/job/qm
 	name = "Quartermaster"

diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
@@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 	var/russian_wiki_name
 	/// Show antag in ghost orbit
 	var/show_in_orbit = TRUE
-	//for voice.dm :catsmile:
+	//for voice.dm
 	var/meta_acquaintances = FALSE
 
 /datum/antagonist/New()

diff --git a/code/modules/economy/Job_Departments.dm b/code/modules/economy/Job_Departments.dm
@@ -1,8 +1,4 @@
-GLOBAL_LIST_INIT(station_departments, list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Support", "Civilian"))
-//Это нужно поскольку GLOB.station_departments определяется во время выполнения
-
 // The department the job belongs to.
-// fuck you cib
 /datum/job/var/department = null
 
 // Whether this is a head position
@@ -102,5 +98,3 @@ GLOBAL_LIST_INIT(station_departments, list("Command", "Medical", "Engineering",
 /datum/job/judge/department = "Security"
 
 /datum/job/lawyer/department = "Security"
-
-
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
@@ -138,7 +138,7 @@
 
 	if(italics)
 		message = "<i>[message]</i>"
-	var/datum/component/voice_model/adv_voice = src.GetComponent(/datum/component/voice_model)
+	var/datum/component/voice_model/adv_voice = GetComponent(/datum/component/voice_model)
 	speaker_name = adv_voice.try_recollect_voice(speaker)
 	var/track = null
 	if(isobserver(src))
@@ -254,7 +254,7 @@
 	if(!ishuman(speaker))
 		return speaker.name
 
-	var/datum/component/voice_model/adv_voice = src.GetComponent(/datum/component/voice_model)
+	var/datum/component/voice_model/adv_voice = GetComponent(/datum/component/voice_model)
 	return adv_voice.try_recollect_voice(speaker)
 
 /mob/proc/handle_track(message, verb = "says", mob/speaker = null, speaker_name, atom/follow_target, hard_to_hear)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
@@ -1,4 +1,3 @@
-
 /mob/living/carbon/human/Initialize(mapload, datum/species/new_species = /datum/species/human)
 	icon = null // This is now handled by overlays -- we just keep an icon for the sake of the map editor.
 	create_dna()
@@ -1964,6 +1963,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 	if(istype(potential_spine))
 		carrydelay *= potential_spine.athletics_boost_multiplier
 	*/
+
 	if(carrydelay <= 3 SECONDS)
 		skills_space = " very quickly"
 	else if(carrydelay <= 4 SECONDS)
@@ -1981,4 +1981,3 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 		return
 
 	return buckle_mob(target, TRUE, FALSE, CARRIER_NEEDS_ARM) //checkloc is false because we usually grab people from nearest tile
-
diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm
@@ -9,16 +9,13 @@
 	. = ..()
 	name = "Pun Pun"
 	real_name = name
-	job = "Bartender"
-	tts_seed = "Chen"
-
 	var/obj/item/clothing/under/punpun/prom = new(src)
-	//var/obj/item/clothing/accessory/petcollar/prom_collar = new(src)
-	var/obj/item/card/id/punpun/punpun_id = new(src)
-	//prom_collar.access_id = punpun_id
-	//prom_collar.on_attached(prom, src)
+	var/obj/item/clothing/accessory/petcollar/prom_collar = new(src)
+	var/obj/item/card/id/punpun/punpun_id = new(prom_collar)
+	prom_collar.access_id = punpun_id
+	prom_collar.on_attached(prom, src)
 	equip_to_slot_if_possible(prom, ITEM_SLOT_CLOTH_INNER)
-	equip_to_slot_if_possible(punpun_id, ITEM_SLOT_ID)
+	tts_seed = "Chen"
 
 /mob/living/carbon/human/lesser/monkey/punpun/can_use_machinery(obj/machinery/mas)
 	. = ..()

diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
@@ -579,7 +579,7 @@ GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM
 			objective.explanation_text = copytext_char(objective.explanation_text, 1, pos)+newname+copytext_char(objective.explanation_text, pos+length)
 	update_voice()
 	if(!LAZYLEN(mass_update))
-		SEND_GLOBAL_SIGNAL(COMSIG_RENAME_VOICE_INJECT, GenDepartamentVoiceTree(src, mass_update))
+		SEND_GLOBAL_SIGNAL(COMSIG_RENAME_VOICE_INJECT, gen_departament_voice_tree(src, mass_update))
 	return 1
 
 /mob/proc/rename_self(var/role, var/allow_numbers = FALSE, var/force = FALSE, list/mass_update = list())