cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11121 from KillianKirilenko/kk-fixes2

Browse Source 
Fix Agent IDs
This commit is contained in:
Novacat
2021-07-17 10:23:29 -04:00
committed by Chompstation Bot
parent 06d8845b5d
commit b456b5287b
2 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
code/game/objects/items/weapons/id cards/id_stacks_vr.dm
View File

@@ -8,209 +8,269 @@
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n") initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n")
/obj/item/weapon/card/id/generic /obj/item/weapon/card/id/generic
name = "Generic ID"
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-silhouette", "clip") initial_sprite_stack = list("base-stamp", "top-generic", "stamp-silhouette", "clip")
//Central //Central
/obj/item/weapon/card/id/centcom /obj/item/weapon/card/id/centcom
name = "Central Command ID"
initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-white", "stripe-gold") initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-white", "stripe-gold")
/obj/item/weapon/card/id/centcom/vip /obj/item/weapon/card/id/centcom/vip
name = "VIP ID"
initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold", "stripe-gold") initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold", "stripe-gold")
//ERT //ERT
/obj/item/weapon/card/id/centcom/ERT /obj/item/weapon/card/id/centcom/ERT
name = "Emergency Responder ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-red", "stripe-red") initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-red", "stripe-red")
/obj/item/weapon/card/id/centcom/ERT/medic /obj/item/weapon/card/id/centcom/ERT/medic
name = "Emergency Medical Responder ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-medblu", "stripe-medblu") initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-medblu", "stripe-medblu")
/obj/item/weapon/card/id/centcom/ERT/commander /obj/item/weapon/card/id/centcom/ERT/commander
name = "Emergency Response Commander ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold", "stripe-gold") initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold", "stripe-gold")
/obj/item/weapon/card/id/centcom/ERT/engineer /obj/item/weapon/card/id/centcom/ERT/engineer
name = "Emergency Engineering Responder ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-orange", "stripe-orange") initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-orange", "stripe-orange")
/obj/item/weapon/card/id/centcom/ERT/janitor /obj/item/weapon/card/id/centcom/ERT/janitor
name = "Emergency Cleanup Responder ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-purple", "stripe-purple") initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-purple", "stripe-purple")
//Silver //Silver
/obj/item/weapon/card/id/silver /obj/item/weapon/card/id/silver
name = "Silver ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n") initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n")
/obj/item/weapon/card/id/silver/secretary /obj/item/weapon/card/id/silver/secretary
name = "Secretary's ID"
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n") initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n")
/obj/item/weapon/card/id/silver/hop /obj/item/weapon/card/id/silver/hop
name = "Head of Personnel ID"
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold") initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold")
//Gold //Gold
/obj/item/weapon/card/id/gold /obj/item/weapon/card/id/gold
name = "Gold ID"
initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n") initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n")
/obj/item/weapon/card/id/gold/captain /obj/item/weapon/card/id/gold/captain
name = "Captain's ID"
initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold") initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold")
/obj/item/weapon/card/id/gold/captain/spare /obj/item/weapon/card/id/gold/captain/spare
name = "Spare ID"
initial_sprite_stack = list("base-stamp-gold", "top-gold", "stamp-n") initial_sprite_stack = list("base-stamp-gold", "top-gold", "stamp-n")
//Medical //Medical
/obj/item/weapon/card/id/medical /obj/item/weapon/card/id/medical
name = "Medical ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n") initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n")
/obj/item/weapon/card/id/medical/chemist /obj/item/weapon/card/id/medical/chemist
name = "Chemist's ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-orange") initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-orange")
/obj/item/weapon/card/id/medical/geneticist /obj/item/weapon/card/id/medical/geneticist
name = "Geneticist's ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-purple") initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-purple")
/obj/item/weapon/card/id/medical/psych /obj/item/weapon/card/id/medical/psych
name = "Psychologist's ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-brown") initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-brown")
/obj/item/weapon/card/id/medical/virologist /obj/item/weapon/card/id/medical/virologist
name = "Virologist's ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-green") initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-green")
/obj/item/weapon/card/id/medical/emt /obj/item/weapon/card/id/medical/emt
name = "Emergency Medical Technician's ID"
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue") initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue")
/obj/item/weapon/card/id/medical/head /obj/item/weapon/card/id/medical/head
name = "Chief Medical Officer's ID"
initial_sprite_stack = list("base-stamp-silver", "top-medblu", "stamp-n", "pips-gold") initial_sprite_stack = list("base-stamp-silver", "top-medblu", "stamp-n", "pips-gold")
//Security //Security
/obj/item/weapon/card/id/security /obj/item/weapon/card/id/security
name = "Security ID"
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n") initial_sprite_stack = list("base-stamp", "top-red", "stamp-n")
/obj/item/weapon/card/id/security/detective /obj/item/weapon/card/id/security/detective
name = "Detective's ID"
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-brown") initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-brown")
/obj/item/weapon/card/id/security/warden /obj/item/weapon/card/id/security/warden
name = "Warden's ID"
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-white") initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-white")
/obj/item/weapon/card/id/security/head /obj/item/weapon/card/id/security/head
name = "Head of Security's ID"
initial_sprite_stack = list("base-stamp-silver", "top-red", "stamp-n", "pips-gold") initial_sprite_stack = list("base-stamp-silver", "top-red", "stamp-n", "pips-gold")
//Engineering //Engineering
/obj/item/weapon/card/id/engineering /obj/item/weapon/card/id/engineering
name = "Engineering ID"
initial_sprite_stack = list("base-stamp", "top-orange", "stamp-n") initial_sprite_stack = list("base-stamp", "top-orange", "stamp-n")
/obj/item/weapon/card/id/engineering/atmos /obj/item/weapon/card/id/engineering/atmos
name = "Atmospherics ID"
initial_sprite_stack = list("base-stamp", "top-orange", "stripe-medblu", "stamp-n") initial_sprite_stack = list("base-stamp", "top-orange", "stripe-medblu", "stamp-n")
/obj/item/weapon/card/id/engineering/head /obj/item/weapon/card/id/engineering/head
name = "Chief Engineer's ID"
initial_sprite_stack = list("base-stamp-silver", "top-orange", "stamp-n", "pips-gold") initial_sprite_stack = list("base-stamp-silver", "top-orange", "stamp-n", "pips-gold")
//Science //Science
/obj/item/weapon/card/id/science /obj/item/weapon/card/id/science
name = "Science ID"
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n") initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n")
/obj/item/weapon/card/id/science/roboticist /obj/item/weapon/card/id/science/roboticist
name = "Roboticist's ID"
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-brown") initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-brown")
/obj/item/weapon/card/id/science/xenobiologist /obj/item/weapon/card/id/science/xenobiologist
name = "Xenobiologist's ID"
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-orange") initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-orange")
/obj/item/weapon/card/id/science/xenobotanist /obj/item/weapon/card/id/science/xenobotanist
name = "Xenobotanist's ID"
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-green") initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-green")
/obj/item/weapon/card/id/science/head /obj/item/weapon/card/id/science/head
name = "Research Director's ID"
initial_sprite_stack = list("base-stamp-silver", "top-purple", "stamp-n", "pips-gold") initial_sprite_stack = list("base-stamp-silver", "top-purple", "stamp-n", "pips-gold")
//Cargo //Cargo
/obj/item/weapon/card/id/cargo /obj/item/weapon/card/id/cargo
name = "Cargo ID"
initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n") initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n")
/obj/item/weapon/card/id/cargo/miner /obj/item/weapon/card/id/cargo/miner
name = "Miner's ID"
initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n", "stripe-purple") initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n", "stripe-purple")
/obj/item/weapon/card/id/cargo/head /obj/item/weapon/card/id/cargo/head
name = "Quartermaster's ID"
initial_sprite_stack = list("base-stamp-silver", "top-brown", "stamp-n", "pips-white") initial_sprite_stack = list("base-stamp-silver", "top-brown", "stamp-n", "pips-white")
//Civilian //Civilian
/obj/item/weapon/card/id/civilian /obj/item/weapon/card/id/civilian
name = "Civilian ID"
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n") initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n")
/obj/item/weapon/card/id/civilian/chaplain /obj/item/weapon/card/id/civilian/chaplain
name = "Chaplain's ID"
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-cross", "stripe-white") initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-cross", "stripe-white")
/obj/item/weapon/card/id/civilian/journalist /obj/item/weapon/card/id/civilian/journalist
name = "Journalist's ID"
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red") initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red")
/obj/item/weapon/card/id/civilian/pilot /obj/item/weapon/card/id/civilian/pilot
name = "Pilot's ID"
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-olive") initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-olive")
/obj/item/weapon/card/id/civilian/entertainer /obj/item/weapon/card/id/civilian/entertainer
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown") name = "Entertainer's ID"
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown")
/obj/item/weapon/card/id/civilian/clown /obj/item/weapon/card/id/civilian/clown
name = "Clown's ID"
initial_sprite_stack = list("base-stamp", "top-rainbow", "stamp-n") initial_sprite_stack = list("base-stamp", "top-rainbow", "stamp-n")
/obj/item/weapon/card/id/civilian/mime /obj/item/weapon/card/id/civilian/mime
name = "Mime's ID"
initial_sprite_stack = list("base-stamp", "top-white", "stamp-n", "stripe-black") initial_sprite_stack = list("base-stamp", "top-white", "stamp-n", "stripe-black")
/obj/item/weapon/card/id/civilian/internal_affairs /obj/item/weapon/card/id/civilian/internal_affairs
name = "Internal Affairs ID"
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "stripe-black") initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "stripe-black")
//Service //Service
/obj/item/weapon/card/id/civilian/service /obj/item/weapon/card/id/civilian/service
name = "Service ID"
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n") initial_sprite_stack = list("base-stamp", "top-green", "stamp-n")
/obj/item/weapon/card/id/civilian/service/botanist /obj/item/weapon/card/id/civilian/service/botanist
name = "Botanist's ID"
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-darkgreen") initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-darkgreen")
/obj/item/weapon/card/id/civilian/service/bartender /obj/item/weapon/card/id/civilian/service/bartender
name = "Bartender's ID"
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-black") initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-black")
/obj/item/weapon/card/id/civilian/service/chef /obj/item/weapon/card/id/civilian/service/chef
name = "Chef's ID"
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-white") initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-white")
/obj/item/weapon/card/id/civilian/service/janitor /obj/item/weapon/card/id/civilian/service/janitor
name = "Janitor's ID"
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-purple") initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-purple")
//Exploration //Exploration
/obj/item/weapon/card/id/exploration /obj/item/weapon/card/id/exploration
name = "Exploration ID"
initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n") initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n")
/obj/item/weapon/card/id/exploration/fm /obj/item/weapon/card/id/exploration/fm
name = "Field Medic's ID"
initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n", "stripe-medblu") initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n", "stripe-medblu")
/obj/item/weapon/card/id/exploration/head /obj/item/weapon/card/id/exploration/head
name = "Pathfinder's ID"
initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white") initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white")
//Talon //Talon
/obj/item/weapon/card/id/talon /obj/item/weapon/card/id/talon
name = "Talon ID"
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette") initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette")
/obj/item/weapon/card/id/talon/doctor /obj/item/weapon/card/id/talon/doctor
name = "Talon Medical ID"
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-medblu", "stripe-medblu") initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-medblu", "stripe-medblu")
/obj/item/weapon/card/id/talon/engineer /obj/item/weapon/card/id/talon/engineer
name = "Talon Engineering ID"
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-orange", "stripe-orange") initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-orange", "stripe-orange")
/obj/item/weapon/card/id/talon/officer /obj/item/weapon/card/id/talon/officer
name = "Talon Security ID"
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-red", "stripe-red") initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-red", "stripe-red")
/obj/item/weapon/card/id/talon/pilot /obj/item/weapon/card/id/talon/pilot
name = "Talon Pilot ID"
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-purple", "stripe-purple") initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-purple", "stripe-purple")
/obj/item/weapon/card/id/talon/captain /obj/item/weapon/card/id/talon/captain
name = "Talon Captain ID"
initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-gold", "stripe-gold") initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-gold", "stripe-gold")
//Antags //Antags
/obj/item/weapon/card/id/syndicate /obj/item/weapon/card/id/syndicate
name = "Syndicate ID"
initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s") initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s")
/obj/item/weapon/card/id/syndicate/officer /obj/item/weapon/card/id/syndicate/officer
name = "Syndicate Officer ID"
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")

6
code/modules/tgui/modules/agentcard.dm
View File

@@ -58,6 +58,8 @@
if(choice && tgui_status(usr, state) == STATUS_INTERACTIVE) if(choice && tgui_status(usr, state) == STATUS_INTERACTIVE)
S.icon_state = choice.icon_state S.icon_state = choice.icon_state
S.item_state = choice.item_state S.item_state = choice.item_state
S.sprite_stack = choice.sprite_stack
S.update_icon()
to_chat(usr, "<span class='notice'>Appearance changed to [choice].</span>") to_chat(usr, "<span class='notice'>Appearance changed to [choice].</span>")
. = TRUE . = TRUE
if("assignment") if("assignment")
@@ -127,9 +129,13 @@
S.electronic_warfare = initial(S.electronic_warfare) S.electronic_warfare = initial(S.electronic_warfare)
S.fingerprint_hash = initial(S.fingerprint_hash) S.fingerprint_hash = initial(S.fingerprint_hash)
S.icon_state = initial(S.icon_state) S.icon_state = initial(S.icon_state)
S.item_state = initial(S.item_state)
S.sprite_stack = S.initial_sprite_stack
S.front = null
S.name = initial(S.name) S.name = initial(S.name)
S.registered_name = initial(S.registered_name) S.registered_name = initial(S.registered_name)
S.unset_registered_user() S.unset_registered_user()
S.sex = initial(S.sex) S.sex = initial(S.sex)
S.update_icon()
to_chat(usr, "<span class='notice'>All information has been deleted from \the [src].</span>") to_chat(usr, "<span class='notice'>All information has been deleted from \the [src].</span>")
. = TRUE . = TRUE