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

Adjusts IDs to match vorestation status quo

Browse Source
This commit is contained in:
Heroman
2021-03-23 18:02:31 +10:00
parent 67dfb26b81
commit 362a5129af
12 changed files with 182 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/jobs/civilian.dm
+6 -6
View File
@@ -1,6 +1,6 @@
/decl/hierarchy/outfit/job/assistant
name = OUTFIT_JOB_NAME(USELESS_JOB) //VOREStation Edit - Visitor not Assistant
id_type = /obj/item/weapon/card/id/assistant
id_type = /obj/item/weapon/card/id/generic //VOREStation Edit
/decl/hierarchy/outfit/job/assistant/visitor
name = OUTFIT_JOB_NAME("Visitor")
@@ -25,7 +25,7 @@
/decl/hierarchy/outfit/job/service/bartender
name = OUTFIT_JOB_NAME("Bartender")
uniform = /obj/item/clothing/under/rank/bartender
id_type = /obj/item/weapon/card/id/civilian/bartender
id_type = /obj/item/weapon/card/id/civilian/service/bartender //VOREStation Edit
pda_type = /obj/item/device/pda/bar
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/bar = 1)
@@ -44,7 +44,7 @@
uniform = /obj/item/clothing/under/rank/chef
suit = /obj/item/clothing/suit/chef
head = /obj/item/clothing/head/chefhat
id_type = /obj/item/weapon/card/id/civilian/chef
id_type = /obj/item/weapon/card/id/civilian/service/chef //VOREStation Edit
pda_type = /obj/item/device/pda/chef
/decl/hierarchy/outfit/job/service/chef/cook
@@ -68,13 +68,13 @@
backpack = /obj/item/weapon/storage/backpack/hydroponics
satchel_one = /obj/item/weapon/storage/backpack/satchel/hyd
messenger_bag = /obj/item/weapon/storage/backpack/messenger/hyd
id_type = /obj/item/weapon/card/id/civilian/botanist
id_type = /obj/item/weapon/card/id/civilian/service/botanist //VOREStation Edit
pda_type = /obj/item/device/pda/botanist
/decl/hierarchy/outfit/job/service/janitor
name = OUTFIT_JOB_NAME("Janitor")
uniform = /obj/item/clothing/under/rank/janitor
id_type = /obj/item/weapon/card/id/civilian/janitor
id_type = /obj/item/weapon/card/id/civilian/service/janitor //VOREStation Edit
pda_type = /obj/item/device/pda/janitor
/decl/hierarchy/outfit/job/librarian
@@ -114,7 +114,7 @@
gloves = /obj/item/clothing/gloves/black
l_ear = /obj/item/device/radio/headset
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/science/explorer
id_type = /obj/item/weapon/card/id/exploration //VOREStation Edit
pda_slot = slot_belt
pda_type = /obj/item/device/pda/cargo // Brown looks more rugged
r_pocket = /obj/item/device/gps/explorer
code/datums/outfits/jobs/civilian_vr.dm
+4 -1
View File
@@ -1,5 +1,5 @@
/decl/hierarchy/outfit/job/assistant/worker
id_type = /obj/item/weapon/card/id/civilian
id_type = /obj/item/weapon/card/id/civilian/service
/decl/hierarchy/outfit/job/assistant/cargo
id_type = /obj/item/weapon/card/id/cargo
@@ -16,3 +16,6 @@
/decl/hierarchy/outfit/job/assistant/officer
id_type = /obj/item/weapon/card/id/security
/decl/hierarchy/outfit/job/assistant/entertainer
id_type = /obj/item/weapon/card/id/civilian/entertainer
code/datums/outfits/jobs/command_vr.dm
+5
View File
@@ -0,0 +1,5 @@
/decl/hierarchy/outfit/job/hop
id_type = /obj/item/weapon/card/id/silver/hop
/decl/hierarchy/outfit/job/secretary
id_type = /obj/item/weapon/card/id/silver/secretary
code/datums/outfits/jobs/medical_vr.dm
+2
View File
@@ -0,0 +1,2 @@
/decl/hierarchy/outfit/job/medical/doctor/virologist
id_type = /obj/item/weapon/card/id/medical/virologist
code/datums/outfits/jobs/science_vr.dm
+8
View File
@@ -0,0 +1,8 @@
/decl/hierarchy/outfit/job/science/xenobiologist
id_type = /obj/item/weapon/card/id/science/xenobiologist
/decl/hierarchy/outfit/job/science/xenobotanist
name = OUTFIT_JOB_NAME("Xenobotanist")
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/weapon/card/id/science/xenobotanist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
code/datums/outfits/jobs/special_vr.dm
+4 -2
View File
@@ -19,7 +19,7 @@
back = /obj/item/weapon/storage/backpack/satchel
id_type = /obj/item/weapon/card/id/centcom/ERT
pda_type = /obj/item/device/pda/centcom
post_equip(var/mob/living/carbon/human/H)
..()
ert.add_antagonist(H.mind)
@@ -31,6 +31,7 @@
shoes = /obj/item/clothing/shoes/clown_shoes
mask = /obj/item/clothing/mask/gas/clown_hat
backpack_contents = list(/obj/item/weapon/stamp/clown = 1, /obj/item/weapon/bikehorn = 1)
id_type = /obj/item/weapon/card/id/civilian/clown
pda_type = /obj/item/device/pda/clown
flags = 0
@@ -41,8 +42,9 @@
head = /obj/item/clothing/head/soft/mime
mask = /obj/item/clothing/mask/gas/mime
backpack_contents = list(/obj/item/weapon/pen/crayon/mime = 1)
id_type = /obj/item/weapon/card/id/civilian/mime
pda_type = /obj/item/device/pda/mime
post_equip(var/mob/living/carbon/human/H)
..()
if(H.backbag == 1)
code/datums/outfits/outfit_vr.dm
+5 -3
View File
@@ -116,7 +116,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/explorer
id_type = /obj/item/weapon/card/id/explorer
id_type = /obj/item/weapon/card/id/exploration
id_pda_assignment = "Explorer"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
@@ -132,6 +132,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_slot = slot_wear_id
pda_slot = slot_belt
pda_type = /obj/item/device/pda
id_type = /obj/item/weapon/card/id/civilian/pilot
id_pda_assignment = "Pilot"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
@@ -145,6 +146,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
belt = /obj/item/weapon/storage/belt/medical/emt
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/sar
id_type = /obj/item/weapon/card/id/exploration/fm
id_pda_assignment = "Field Medic"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
@@ -156,10 +158,10 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/pathfinder
id_type = /obj/item/weapon/card/id/explorer/head
id_type = /obj/item/weapon/card/id/exploration/head
id_pda_assignment = "Pathfinder"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/assistant/explorer
id_type = /obj/item/weapon/card/id/explorer
id_type = /obj/item/weapon/card/id/exploration
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
code/game/jobs/job/civilian_vr.dm
+1 -1
View File
@@ -194,7 +194,7 @@
minimal_access = list(access_entertainment)
pto_type = PTO_CIVILIAN
outfit_type = /decl/hierarchy/outfit/job/assistant
outfit_type = /decl/hierarchy/outfit/job/assistant/entertainer
job_description = "An entertainer does just that, entertains! Put on plays, play music, sing songs, tell stories, or read your favorite fanfic."
alt_titles = list("Performer" = /datum/alt_title/performer, "Musician" = /datum/alt_title/musician, "Stagehand" = /datum/alt_title/stagehand,
"Actor" = /datum/alt_title/actor, "Dancer" = /datum/alt_title/dancer, "Singer" = /datum/alt_title/singer,
code/game/objects/items/weapons/id cards/id_stacks.dm
+4 -2
View File
@@ -7,6 +7,7 @@
base_icon = "icons/obj/card_new.dmi"
// New sprite stacks can be defined here. You could theoretically change icon-states as well but right now this file compiles before station_ids.dm so those wouldn't be affected.
/*
id
generic
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-silhouette", "clip")
@@ -77,7 +78,7 @@
bartender
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-dark")
chef
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-white")
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-white")
janitor
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-purple")
journalist
@@ -93,4 +94,5 @@
syndicate
initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s")
officer
initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s", "pips-gold", "stripe-gold")
initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s", "pips-gold", "stripe-gold")
*/ // VOREStation Removal - defined in id_stacks_vr.dm
code/game/objects/items/weapons/id cards/id_stacks_vr.dm
+131
View File
@@ -0,0 +1,131 @@
/obj/item/weapon/card
id
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n")
generic
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-silhouette", "clip")
centcom
initial_sprite_stack = list("base-stamp-silver", "top-darkgreen", "stamp-n", "pips-gold", "stripe-gold")
vip
initial_sprite_stack = list("base-stamp-gold", "top-darkgreen", "stamp-n", "pips-gold", "stripe-gold")
ERT
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-red", "stripe-red")
medic
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-medblu", "stripe-medblu")
commander
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold", "stripe-gold")
engineer
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-orange", "stripe-orange")
janitor
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-purple", "stripe-purple")
silver
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n")
secretary
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n")
hop
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold")
medical
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n")
chemist
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-orange")
geneticist
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-purple")
psych
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-brown")
virologist
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-green")
emt
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue")
head
initial_sprite_stack = list("base-stamp-silver", "top-medblu", "stamp-n", "pips-gold")
/*
sar
initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n", "pips-medblu")
*/
security
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n")
detective
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-brown")
warden
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-white")
head
initial_sprite_stack = list("base-stamp-silver", "top-red", "stamp-n", "pips-gold")
engineering
initial_sprite_stack = list("base-stamp", "top-orange", "stamp-n")
atmos
initial_sprite_stack = list("base-stamp", "top-orange", "stripe-medblu", "stamp-n")
head
initial_sprite_stack = list("base-stamp-silver", "top-orange", "stamp-n", "pips-gold")
science
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n")
roboticist
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-brown")
xenobiologist
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-orange")
xenobotanist
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-green")
/*
explorer
initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n")
*/
head
initial_sprite_stack = list("base-stamp-silver", "top-purple", "stamp-n", "pips-gold")
/*
pathfinder
initial_sprite_stack = list("base-stamp-silver", "top-darkgreen", "stamp-n", "pips-purple") //not a true head, no gold stripe for you
*/
cargo
initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n")
miner
initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n", "stripe-purple")
head
initial_sprite_stack = list("base-stamp-silver", "top-brown", "stamp-n", "pips-white")
civilian
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n")
chaplain
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-cross", "stripe-white")
internal_affairs
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "stripe-black")
service
botanist
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-darkgreen")
bartender
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-black")
chef
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-white")
janitor
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-purple")
journalist
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red")
clown
initial_sprite_stack = list("base-stamp", "top-rainbow", "stamp-n")
mime
initial_sprite_stack = list("base-stamp", "top-white", "stamp-n", "stripe-black")
entertainer
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown")
pilot
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-pink")
head
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold")
exploration
initial_sprite_stack = list("base-stamp", "top-pink", "stamp-n")
fm
initial_sprite_stack = list("base-stamp", "top-pink", "stamp-n", "stripe-medblu")
head
initial_sprite_stack = list("base-stamp-silver", "top-pink", "stamp-n", "pips-white")
talon
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette")
doctor
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-medblu", "stripe-medblu")
engineer
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-orange", "stripe-orange")
officer
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-red", "stripe-red")
pilot
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-purple", "stripe-purple")
captain
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-gold", "stripe-gold")
syndicate
initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s")
officer
initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s", "pips-gold", "stripe-gold")