cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 20:14:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

up to officer

Browse Source
This commit is contained in:
Kashargul
2024-09-12 00:00:11 +02:00
parent dc8c545f65
commit 0425a4e396
94 changed files with 412 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/job_start_landmarks.dm
+8 -8
View File
@@ -1,17 +1,17 @@
/obj/effect/landmark/start/captain
name = "Site Manager"
name = JOB_SITE_MANAGER
/obj/effect/landmark/start/hop
name = "Head of Personnel"
name = JOB_HEAD_OF_PERSONNEL
/obj/effect/landmark/start/commandsecretary
name = "Command Secretary"
name = JOB_COMMAND_SECRETARY
/obj/effect/landmark/start/hos
name = "Head of Security"
name = JOB_HEAD_OF_SECURITY
/obj/effect/landmark/start/warden
name = "Warden"
name = JOB_WARDEN
/obj/effect/landmark/start/detective
name = "Detective"
name = JOB_DETECTIVE
/obj/effect/landmark/start/security
name = "Security Officer"
name = JOB_SECURITY_OFFICER
/obj/effect/landmark/start/ce
name = "Chief Engineer"
/obj/effect/landmark/start/atmostech
@@ -43,7 +43,7 @@
/obj/effect/landmark/start/cargo
name = "Cargo Technician"
/obj/effect/landmark/start/miner
name = "Shaft Miner"
name = JOB_SHAFT_MINER
/* //VOREStation Removal
/obj/effect/landmark/start/pf
name = "Pathfinder"
code/game/objects/items/devices/radio/headset.dm
+2 -2
View File
@@ -258,13 +258,13 @@
/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the poor fool who will one day be Site Manager."
desc = "The headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "."
icon_state = "com_headset"
ks2type = /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/heads/hop/alt
name = "head of personnel's bowman headset"
desc = "The headset of the poor fool who will one day be Site Manager."
desc = "The headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "."
icon_state = "com_headset_alt"
ks2type = /obj/item/device/encryptionkey/heads/hop
code/game/objects/items/toys/toys.dm
+14 -14
View File
@@ -347,8 +347,8 @@
toysay = "Dude, I see colors..."
/obj/item/toy/figure/captain
name = "Site Manager action figure"
desc = "A \"Space Life\" brand Site Manager action figure."
name = JOB_SITE_MANAGER + " action figure"
desc = "A \"Space Life\" brand " + JOB_SITE_MANAGER + " action figure."
icon_state = "captain"
toysay = "How do I open this display case?"
@@ -395,8 +395,8 @@
toysay = "Arf!"
/obj/item/toy/figure/detective
name = "Detective action figure"
desc = "A \"Space Life\" brand Detective action figure."
name = JOB_DETECTIVE + " action figure"
desc = "A \"Space Life\" brand " + JOB_DETECTIVE + " action figure."
icon_state = "detective"
toysay = "This airlock has grey jumpsuit and insulated glove fibers on it."
@@ -419,14 +419,14 @@
toysay = "I'm not qualified for this job."
/obj/item/toy/figure/hop
name = "Head of Personnel action figure"
desc = "A \"Space Life\" brand Head of Personnel action figure."
name = JOB_HEAD_OF_PERSONNEL + " action figure"
desc = "A \"Space Life\" brand " + JOB_HEAD_OF_PERSONNEL + " action figure."
icon_state = "hop"
toysay = "Giving out all access!"
/obj/item/toy/figure/hos
name = "Head of Security action figure"
desc = "A \"Space Life\" brand Head of Security action figure."
name = JOB_HEAD_OF_SECURITY + " action figure"
desc = "A \"Space Life\" brand " + JOB_HEAD_OF_SECURITY + " action figure."
icon_state = "hos"
toysay = "I'm here to win, anything else is secondary."
@@ -467,8 +467,8 @@
toysay = "..."
/obj/item/toy/figure/miner
name = "Shaft Miner action figure"
desc = "A \"Space Life\" brand Shaft Miner action figure."
name = JOB_SHAFT_MINER + " action figure"
desc = "A \"Space Life\" brand " + JOB_SHAFT_MINER + " action figure."
icon_state = "miner"
toysay = "Oh god, it's eating my intestines!"
@@ -509,8 +509,8 @@
toysay = "Get that fucking disk!"
/obj/item/toy/figure/secofficer
name = "Security Officer action figure"
desc = "A \"Space Life\" brand Security Officer action figure."
name = JOB_SECURITY_OFFICER + " action figure"
desc = "A \"Space Life\" brand " + JOB_SECURITY_OFFICER + " action figure."
icon_state = "secofficer"
toysay = "I am the law!"
@@ -521,8 +521,8 @@
toysay = "The cure is potassium!"
/obj/item/toy/figure/warden
name = "Warden action figure"
desc = "A \"Space Life\" brand Warden action figure."
name = JOB_WARDEN + " action figure"
desc = "A \"Space Life\" brand " + JOB_WARDEN + " action figure."
icon_state = "warden"
toysay = "Execute him for breaking in!"
code/game/objects/items/toys/toys_vr.dm
+1 -1
View File
@@ -539,7 +539,7 @@
continue
players += player.real_name
var/random_player = "The Site Manager"
var/random_player = "The " + JOB_SITE_MANAGER
if(cooldown < world.time)
cooldown = (world.time + 300) // Sets cooldown at 30 seconds
if(players.len)
code/game/objects/items/weapons/dna_injector.dm
+1 -1
View File
@@ -158,7 +158,7 @@
/obj/item/weapon/dnainjector/xraymut
name = "\improper DNA injector (Xray)"
desc = "Finally you can see what the Site Manager does."
desc = "Finally you can see what the " + JOB_SITE_MANAGER + " does."
datatype = DNA2_BUF_SE
value = 0xFFF
code/game/objects/items/weapons/grenades/flashbang.dm
+2 -2
View File
@@ -99,7 +99,7 @@
/obj/item/weapon/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve
desc = "Use of this weapon may constiute a war crime in your area, consult your local Site Manager."
desc = "Use of this weapon may constiute a war crime in your area, consult your local " + JOB_SITE_MANAGER + "."
name = "clusterbang"
icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang"
@@ -162,4 +162,4 @@
var/dettime = rand(15,60)
spawn(dettime)
detonate()
detonate()
code/game/objects/items/weapons/id cards/cards.dm
+1 -1
View File
@@ -273,7 +273,7 @@
var/mob/living/silicon/robot/R
var/last_robot_loc
name = "Robot Miner ID"
rank = "Shaft Miner"
rank = JOB_SHAFT_MINER
/obj/item/weapon/card/id/cargo/miner/borg/Initialize()
. = ..()
code/game/objects/items/weapons/id cards/id_stacks.dm
+12 -4
View File
@@ -58,10 +58,12 @@
/obj/item/weapon/card/id/silver/secretary
name = "Secretary's ID"
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n")
rank = JOB_COMMAND_SECRETARY
/obj/item/weapon/card/id/silver/hop
name = "Head of Personnel ID"
name = JOB_HEAD_OF_PERSONNEL + " ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold")
rank = JOB_HEAD_OF_PERSONNEL
//Gold
@@ -76,6 +78,7 @@
/obj/item/weapon/card/id/gold/captain/spare
name = "Spare ID"
initial_sprite_stack = list("base-stamp-gold", "top-gold", "stamp-n")
rank = JOB_SITE_MANAGER
//Medical
@@ -112,18 +115,22 @@
/obj/item/weapon/card/id/security
name = "Security ID"
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n")
rank = JOB_SECURITY_OFFICER
/obj/item/weapon/card/id/security/detective
name = "Detective's ID"
name = JOB_DETECTIVE + "'s ID"
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-brown")
rank = JOB_DETECTIVE
/obj/item/weapon/card/id/security/warden
name = "Warden's ID"
name = JOB_WARDEN + "'s ID"
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-white")
rank = JOB_WARDEN
/obj/item/weapon/card/id/security/head
name = "Head of Security's ID"
name = JOB_HEAD_OF_SECURITY + "'s ID"
initial_sprite_stack = list("base-stamp-silver", "top-red", "stamp-n", "pips-gold")
rank = JOB_HEAD_OF_SECURITY
//Engineering
@@ -170,6 +177,7 @@
/obj/item/weapon/card/id/cargo/miner
name = "Miner's ID"
initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n", "stripe-purple")
rank = JOB_SHAFT_MINER
/obj/item/weapon/card/id/cargo/head
name = "Quartermaster's ID"
code/game/objects/items/weapons/id cards/station_ids.dm
+14 -13
View File
@@ -142,14 +142,14 @@
preserve_item = 1
/obj/item/weapon/card/id/gold/captain
assignment = "Site Manager"
rank = "Site Manager"
assignment = JOB_SITE_MANAGER
rank = JOB_SITE_MANAGER
/obj/item/weapon/card/id/gold/captain/spare
name = "\improper Site Manager's spare ID"
name = "\improper " + JOB_SITE_MANAGER + "'s spare ID"
desc = "The emergency spare ID for the station's very own Big Cheese."
icon_state = "gold-id-alternate"
registered_name = "Site Manager"
registered_name = JOB_SITE_MANAGER
/obj/item/weapon/card/id/gold/captain/spare/fakespare
rank = "null"
@@ -233,18 +233,19 @@
icon_state = "security-id"
primary_color = rgb(189,47,0)
secondary_color = rgb(223,127,95)
rank = JOB_SECURITY_OFFICER
/obj/item/weapon/card/id/security/warden
assignment = "Warden"
rank = "Warden"
assignment = JOB_WARDEN
rank = JOB_WARDEN
/obj/item/weapon/card/id/security/head
name = "identification card"
desc = "A card which represents honor and protection."
primary_color = rgb(189,47,0)
secondary_color = rgb(255,223,127)
assignment = "Head of Security"
rank = "Head of Security"
assignment = JOB_HEAD_OF_SECURITY
rank = JOB_HEAD_OF_SECURITY
/obj/item/weapon/card/id/engineering
name = "identification card"
@@ -524,7 +525,7 @@
"Visitor" = "itg",
"Quartermaster" = "itg",
"Cargo Technician" = "itg",
"Shaft Miner" = "itg",
JOB_SHAFT_MINER = "itg",
"Intern" = "itg",
"Talon Pilot" = "itg",
"Talon Miner" = "itg",
@@ -536,9 +537,9 @@
"Entertainer" = "itg_green",
"Janitor" = "itg_green",
"Librarian" = "itg_green",
"Warden" = "itg_red",
"Detective" = "itg_red",
"Security Officer" = "itg_red",
JOB_WARDEN = "itg_red",
JOB_DETECTIVE = "itg_red",
JOB_SECURITY_OFFICER = "itg_red",
"Talon Guard" = "itg_red",
"Roboticist" = "itg_purple",
"Scientist" = "itg_purple",
@@ -577,7 +578,7 @@
/obj/item/weapon/card/id/event/polymorphic/itg/attackby(obj/item/I as obj, var/mob/user)
if(istype(I, /obj/item/weapon/card/id) && !accessset)
var/obj/item/weapon/card/id/O = I
var/list/itgdont = list("Site Manager", "Head of Personnel", "Command Secretary", "Head of Security", "Chief Engineer", "Chief Medical Officer", "Research Director", "Clown", "Mime", "Talon Captain") //If you're in as one of these you probably aren't representing ITG
var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, "Head of Security", "Chief Engineer", "Chief Medical Officer", "Research Director", "Clown", "Mime", "Talon Captain") //If you're in as one of these you probably aren't representing ITG
if(O.rank in itgdont)
to_chat(user, "<span class='notice'>ITG Cards do not seem to be able to accept the access codes for your ID.</span>")
return