cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +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
/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
var/datum/job/job = GetJob(rank)
@@ -494,7 +494,7 @@ var/global/datum/controller/occupations/job_master
return H
// 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)
captain_announcement.Announce("All hands, [alt_title ? alt_title : "Site Manager"] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z)

14
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(equipment)
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.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
equip_custom_items(new_character) //CHOMPEdit readded to enable custom_item.txt
@@ -550,10 +550,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
log_admin("[admin] has spawned [player_key]'s character [new_character.real_name].")
message_admins("[admin] has spawned [player_key]'s character [new_character.real_name].", 1)
feedback_add_details("admin_verb","RSPCH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
// Drop pods
if(showy == "Polite")
var/turf/T = get_turf(new_character)
@@ -1078,7 +1078,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Drop Pod Atom"
set desc = "Spawn a new atom/movable in a drop pod where you are."
set category = "Fun"
if(!check_rights(R_SPAWN))
return
@@ -1099,7 +1099,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
chosen = tgui_input_list(usr, "Select a movable type:", "Spawn in Drop Pod", matches)
if(!chosen)
return
var/podtype = tgui_alert(src,"Destructive drop pods cause damage in a 3x3 and may break turfs. Polite drop pods lightly damage the turfs but won't break through.", "Drop Pod", list("Polite", "Destructive", "Cancel"))
if(podtype == "Cancel")
return
@@ -1120,14 +1120,14 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Drop Pod Deploy"
set desc = "Drop an existing mob where you are in a drop pod."
set category = "Fun"
if(!check_rights(R_SPAWN))
return
var/mob/living/L = tgui_input_list(usr, "Select the mob to drop:", "Mob Picker", living_mob_list)
if(!L)
return
var/podtype = tgui_alert(src,"Destructive drop pods cause damage in a 3x3 and may break turfs. Polite drop pods lightly damage the turfs but won't break through.", "Drop Pod", list("Polite", "Destructive", "Cancel"))
if(podtype == "Cancel")
return