cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

All hands announce respects silent admin spawn

Browse Source
This commit is contained in:
TheGreatKitsune
2022-07-01 19:26:11 -05:00
parent acb9521a80
commit fc499d28f1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/jobs/job_controller.dm
View File

@@ -355,7 +355,7 @@ var/global/datum/controller/occupations/job_master
return 1 return 1
/datum/controller/occupations/proc/EquipRank(var/mob/living/carbon/human/H, var/rank, var/joined_late = 0) /datum/controller/occupations/proc/EquipRank(var/mob/living/carbon/human/H, var/rank, var/joined_late = 0, var/announce = TRUE)
if(!H) return null if(!H) return null
var/datum/job/job = GetJob(rank) var/datum/job/job = GetJob(rank)
@@ -494,7 +494,7 @@ var/global/datum/controller/occupations/job_master
return H return H
// TWEET PEEP // TWEET PEEP
if(rank == "Site Manager") if(rank == "Site Manager" && announce)
var/sound/announce_sound = (ticker.current_state <= GAME_STATE_SETTING_UP) ? null : sound('sound/misc/boatswain.ogg', volume=20) var/sound/announce_sound = (ticker.current_state <= GAME_STATE_SETTING_UP) ? null : sound('sound/misc/boatswain.ogg', volume=20)
captain_announcement.Announce("All hands, [alt_title ? alt_title : "Site Manager"] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z) captain_announcement.Announce("All hands, [alt_title ? alt_title : "Site Manager"] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z)

2
code/modules/admin/verbs/randomverbs.dm
View File

@@ -529,7 +529,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
//If desired, apply equipment. //If desired, apply equipment.
if(equipment) if(equipment)
if(charjob) if(charjob)
job_master.EquipRank(new_character, charjob, 1) job_master.EquipRank(new_character, charjob, 1, announce)
new_character.mind.assigned_role = charjob new_character.mind.assigned_role = charjob
new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob) new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
equip_custom_items(new_character) //CHOMPEdit readded to enable custom_item.txt equip_custom_items(new_character) //CHOMPEdit readded to enable custom_item.txt