mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Fixes #2352
This commit is contained in:
@@ -63,7 +63,7 @@ var/savefile/Banlistjob
|
||||
bantimestamp = CMinutes + minutes
|
||||
if(rank == "Heads")
|
||||
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Personnel")
|
||||
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Captain")
|
||||
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Administrator")
|
||||
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security")
|
||||
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer")
|
||||
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")
|
||||
|
||||
@@ -262,7 +262,7 @@
|
||||
id.icon_state = "gold"
|
||||
id.access = get_all_accesses()
|
||||
id.registered_name = H.real_name
|
||||
id.assignment = "Captain"
|
||||
id.assignment = "Station Administrator"
|
||||
id.name = "[id.registered_name]'s ID Card ([id.assignment])"
|
||||
H.equip_to_slot_or_del(id, slot_wear_id)
|
||||
H.update_inv_wear_id()
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
/datum/gear/accessory/holster
|
||||
display_name = "holster, armpit"
|
||||
path = /obj/item/clothing/accessory/holster/armpit
|
||||
allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
|
||||
allowed_roles = list("Station Administrator", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
|
||||
|
||||
/datum/gear/accessory/holster/hip
|
||||
display_name = "holster, hip"
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
/datum/gear/eyes/shades
|
||||
display_name = "Sunglasses, fat (Security/Command)"
|
||||
path = /obj/item/clothing/glasses/sunglasses/big
|
||||
allowed_roles = list("Security Officer","Head of Security","Warden","Captain","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
|
||||
allowed_roles = list("Security Officer","Head of Security","Warden","Station Administrator","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
|
||||
|
||||
/datum/gear/eyes/glasses/fakesun
|
||||
display_name = "Sunglasses, stylish"
|
||||
|
||||
@@ -230,9 +230,9 @@
|
||||
path = /obj/item/clothing/suit/storage/hooded/wintercoat
|
||||
|
||||
/datum/gear/suit/wintercoat/captain
|
||||
display_name = "winter coat, captain"
|
||||
display_name = "winter coat, station administrator"
|
||||
path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain
|
||||
allowed_roles = list("Captain")
|
||||
allowed_roles = list("Station Administrator")
|
||||
|
||||
/datum/gear/suit/wintercoat/security
|
||||
display_name = "winter coat, security"
|
||||
|
||||
@@ -284,9 +284,9 @@
|
||||
path = /obj/item/clothing/under/dress/dress_fire
|
||||
|
||||
/datum/gear/uniform/uniform_captain
|
||||
display_name = "uniform, captain's dress"
|
||||
display_name = "uniform, station administrator's dress"
|
||||
path = /obj/item/clothing/under/dress/dress_cap
|
||||
allowed_roles = list("Captain")
|
||||
allowed_roles = list("Station Administrator")
|
||||
|
||||
/datum/gear/uniform/corpdetsuit
|
||||
display_name = "uniform, corporate (Detective)"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/obj/item/clothing/gloves/captain
|
||||
desc = "Regal blue gloves, with a nice gold trim. Swanky."
|
||||
name = "captain's gloves"
|
||||
name = "station administrator's gloves"
|
||||
icon_state = "captain"
|
||||
item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
body_parts_covered = 0
|
||||
|
||||
/obj/item/clothing/head/collectable/captain
|
||||
name = "collectable captain's hat"
|
||||
name = "collectable station administrator's hat"
|
||||
desc = "A Collectable Hat that'll make you look just like a real comdom!"
|
||||
icon_state = "captain"
|
||||
body_parts_covered = 0
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
//Captain
|
||||
/obj/item/clothing/head/caphat
|
||||
name = "captain's hat"
|
||||
name = "station administrator's hat"
|
||||
icon_state = "captain"
|
||||
desc = "It's good being the king."
|
||||
body_parts_covered = 0
|
||||
|
||||
/obj/item/clothing/head/caphat/cap
|
||||
name = "captain's cap"
|
||||
name = "station administrator's cap"
|
||||
desc = "You fear to wear it for the negligence it brings."
|
||||
icon_state = "capcap"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
//Captain's space suit This is not the proper path but I don't currently know enough about how this all works to mess with it.
|
||||
/obj/item/clothing/suit/armor/captain
|
||||
name = "Captain's armor"
|
||||
name = "Station Administrator's armor"
|
||||
desc = "A bulky, heavy-duty piece of exclusive corporate armor. YOU are in charge!"
|
||||
icon_state = "caparmor"
|
||||
w_class = 5
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
/obj/item/rig_module/self_destruct
|
||||
|
||||
name = "self-destruct module"
|
||||
desc = "Oh my God, Captain. A bomb."
|
||||
desc = "Oh my God, Station Administrator. A bomb."
|
||||
icon_state = "deadman"
|
||||
usable = 1
|
||||
active = 1
|
||||
|
||||
@@ -14,15 +14,15 @@
|
||||
|
||||
//Captain
|
||||
/obj/item/clothing/suit/captunic
|
||||
name = "captain's parade tunic"
|
||||
desc = "Worn by a Captain to show their class."
|
||||
name = "station administrator's parade tunic"
|
||||
desc = "Worn by a Station Administrator to show their class."
|
||||
icon_state = "captunic"
|
||||
body_parts_covered = UPPER_TORSO|ARMS
|
||||
flags_inv = HIDEJUMPSUIT
|
||||
|
||||
/obj/item/clothing/suit/captunic/capjacket
|
||||
name = "captain's uniform jacket"
|
||||
desc = "A less formal jacket for everyday captain use."
|
||||
name = "station administrator's uniform jacket"
|
||||
desc = "A less formal jacket for everyday Station Administrator use."
|
||||
icon_state = "capjacket"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
||||
flags_inv = HIDEJUMPSUIT
|
||||
|
||||
@@ -555,7 +555,7 @@
|
||||
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
|
||||
|
||||
/obj/item/clothing/suit/storage/hooded/wintercoat/captain
|
||||
name = "captain's winter coat"
|
||||
name = "station administrator's winter coat"
|
||||
icon_state = "coatcaptain"
|
||||
item_state_slots = list(slot_r_hand_str = "coatcaptain", slot_l_hand_str = "coatcaptain")
|
||||
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
rolled_sleeves = 0
|
||||
|
||||
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
|
||||
desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
|
||||
name = "captain's jumpsuit"
|
||||
desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Station Administrator\"."
|
||||
name = "station administrator's jumpsuit"
|
||||
icon_state = "captain"
|
||||
rolled_sleeves = 0
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
rolled_sleeves = 0
|
||||
|
||||
/obj/item/clothing/under/gimmick/rank/captain/suit
|
||||
name = "captain's suit"
|
||||
name = "station administrator's suit"
|
||||
desc = "A green suit and yellow necktie. Exemplifies authority."
|
||||
icon_state = "green_suit"
|
||||
item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom")
|
||||
@@ -315,8 +315,8 @@
|
||||
item_state_slots = list(slot_r_hand_str = "dress_white", slot_l_hand_str = "dress_white")
|
||||
|
||||
/obj/item/clothing/under/dress/dress_cap
|
||||
name = "captain's dress uniform"
|
||||
desc = "Feminine fashion for the style concious captain."
|
||||
name = "station administrator's dress uniform"
|
||||
desc = "Feminine fashion for the style concious Station Administrator."
|
||||
icon_state = "dress_cap"
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
|
||||
|
||||
@@ -382,8 +382,8 @@
|
||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||
|
||||
/obj/item/clothing/under/captainformal
|
||||
name = "captain's formal uniform"
|
||||
desc = "A captain's formal-wear, for special occasions."
|
||||
name = "station administrator's formal uniform"
|
||||
desc = "A Station Administrator's formal-wear, for special occasions."
|
||||
icon_state = "captain_formal"
|
||||
item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
var/list/dreams = list(
|
||||
"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the captain",
|
||||
"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the Station Administrator",
|
||||
"voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
|
||||
"light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun",
|
||||
"a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights",
|
||||
|
||||
@@ -189,7 +189,7 @@ mob/living/carbon/proc/handle_hallucinations()
|
||||
|
||||
var/possible_txt = list("Launch Escape Pods","Self-Destruct Sequence","\[Swipe ID\]","De-Monkify",\
|
||||
"Reticulate Splines","Plasma","Open Valve","Lockdown","Nerf Airflow","Kill Traitor","Nihilism",\
|
||||
"OBJECTION!","Arrest Stephen Bowman","Engage Anti-Trenna Defenses","Increase Captain IQ","Retrieve Arms",\
|
||||
"OBJECTION!","Arrest Stephen Bowman","Engage Anti-Trenna Defenses","Increase Station Administrator IQ","Retrieve Arms",\
|
||||
"Play Charades","Oxygen","Inject BeAcOs","Ninja Lizards","Limit Break","Build Sentry")
|
||||
|
||||
if(mid_txts)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"The Chaplain this shift is worshiping _____.",
|
||||
"Cargo ordered a crate full of _____.",
|
||||
"An ERT was called due to ______.",
|
||||
"Alert! The Captain has armed themselves with _____.",
|
||||
"Alert! The Station Administrator has armed themselves with _____.",
|
||||
"Current Laws: ________ is your master.",
|
||||
"Current Laws: ________ is the enemy.",
|
||||
"_____ vented the entirety of Cargo.",
|
||||
@@ -14,7 +14,7 @@
|
||||
"Caution, ______ have been detected in collision course with the station.",
|
||||
"Today's kitchen menu includes _______.",
|
||||
"What did the mercenaries want when they attacked the station?",
|
||||
"I think the Captain is insane. He just demanded ______ in his office.",
|
||||
"I think the Station Administrator is insane. He just demanded ______ in his office.",
|
||||
"Fuckin' scientists, they just turned Misc. Research into _______ .",
|
||||
"What's my fetish?",
|
||||
"Hello, _______ here with _______",
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"Space 'Nam",
|
||||
"Space lesbians",
|
||||
"The Gardener getting SUPER high",
|
||||
"The Captain thinking they're a badass",
|
||||
"The Station Administrator thinking they're a badass",
|
||||
"Being in a cult",
|
||||
"Racially biased lawsets",
|
||||
"An Unathi who WON'T STOP FIGHTING",
|
||||
@@ -57,7 +57,7 @@
|
||||
"An irritatingly chipper robot",
|
||||
"Androids hanging out in the bar drinking beer",
|
||||
"Gear harnesses",
|
||||
"A seventeen-year-old Captain",
|
||||
"A seventeen-year-old Station Administrator",
|
||||
"The throbbing erection that the HoS gets at the thought of shooting something",
|
||||
"Trying to stab someone and hugging them instead",
|
||||
"Waking up naked in the maintenance tunnels",
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
"Crab say what?",
|
||||
"Man they say we have space lizards now, man this shit is getting more wack every minute",
|
||||
"The so called \"improved\" station AI is just bullshit, that thing aint fun for noone",
|
||||
"The Captain is a traitor, he took my power core.",
|
||||
"The Station Administrator is a traitor, he took my power core.",
|
||||
"Say \"what\" again. Say \"what\" again. I dare you. I double-dare you, motherfucker. Say \"what\" one more goddamn time.",
|
||||
"Ezekiel 25:17 ,The path of the righteous man is beset on all sides by the iniquities of the selfish and the tyranny of evil men. Blessed is he who in the name of charity and good will shepherds the weak through the valley of darkness, for he is truly his brother's keeper and the finder of lost children. And I will strike down upon thee with great vengeance and furious anger those who attempt to poison and destroy my brothers. And you will know my name is the Lord... when I lay my vengeance upon thee.",
|
||||
"Did you notice a sign out in front of my house that said \"Dead Nigger Storage\"?")
|
||||
|
||||
@@ -62,7 +62,7 @@ var/global/list/SKILL_PRE = list("Engineer" = SKILL_ENGINEER, "Roboticist" = SKI
|
||||
/datum/skill/knowledge/law
|
||||
ID = "law"
|
||||
name = "Corporate Law"
|
||||
desc = "Your knowledge of corporate law and procedures. This includes Corporate Regulations, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for captains."
|
||||
desc = "Your knowledge of corporate law and procedures. This includes Corporate Regulations, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for Station Administrators."
|
||||
field = "Security"
|
||||
secondary = 1
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
icon_state = "folder_white"
|
||||
|
||||
/obj/item/weapon/folder/blue_captain
|
||||
desc = "A blue folder with Captain markings."
|
||||
desc = "A blue folder with Station Administrator markings."
|
||||
icon_state = "folder_captain"
|
||||
|
||||
/obj/item/weapon/folder/blue_hop
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -13,7 +13,7 @@
|
||||
attack_verb = list("stamped")
|
||||
|
||||
/obj/item/weapon/stamp/captain
|
||||
name = "captain's rubber stamp"
|
||||
name = "station administrator's rubber stamp"
|
||||
icon_state = "stamp-cap"
|
||||
|
||||
/obj/item/weapon/stamp/hop
|
||||
|
||||
@@ -256,8 +256,8 @@
|
||||
..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/flask
|
||||
name = "\improper Captain's flask"
|
||||
desc = "A metal flask belonging to the captain"
|
||||
name = "\improper Station Administrator's flask"
|
||||
desc = "A metal flask belonging to the Station Administrator"
|
||||
icon_state = "flask"
|
||||
volume = 60
|
||||
center_of_mass = list("x"=17, "y"=7)
|
||||
|
||||
Reference in New Issue
Block a user