cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1660 from CHOMPStationBot/upstream-merge-10008

Browse Source 
[MIRROR] [MIRROR] Patches new ID card code
This commit is contained in:
Nadyr
2021-03-27 23:08:45 -04:00
committed by GitHub
parent d603b7aa56 ace9beb3d1
commit e2b120b34a
4 changed files with 139 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/id cards/cards.dm
+1 -1
View File
@@ -20,7 +20,7 @@
var/associated_account_number = 0
var/list/initial_sprite_stack = list("")
var/base_icon = "icons/obj/card_new.dmi"
var/base_icon = 'icons/obj/card_new.dmi'
var/list/sprite_stack
var/list/files = list( )
code/game/objects/items/weapons/id cards/id_stacks.dm
+138 -90
View File
@@ -4,95 +4,143 @@
/obj/item/weapon/card
icon = 'icons/obj/card_new.dmi' // These are redefined here so that changing sprites is as easy as clicking the checkbox.
base_icon = "icons/obj/card_new.dmi"
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")
centcom
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "pips-gold")
vip
initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold")
ERT
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "pips-red", "stripe-red")
silver
initial_sprite_stack = list("base-stamp-silver", "top-mime", "stamp-n-generic")
secretary
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n")
hop
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "stripe-white")
medical
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n")
chemist
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "pips-orange")
geneticist
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "pips-purple")
psych
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "pips-purple")
emt
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "pips-blue")
head
initial_sprite_stack = list("base-stamp-silver", "top-medblu", "stamp-n", "stripe-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", "pips-brown")
warden
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "pips-white")
head
initial_sprite_stack = list("base-stamp-silver", "top-red", "stamp-n", "stripe-gold")
engineering
initial_sprite_stack = list("base-stamp", "top-orange", "stamp-n")
atmos
initial_sprite_stack = list("base-stamp", "top-orange", "pips-medblu", "stamp-n")
head
initial_sprite_stack = list("base-stamp-silver", "top-orange", "stamp-n", "stripe-gold")
science
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n")
roboticist
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "pips-orange")
explorer
initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n")
head
initial_sprite_stack = list("base-stamp-silver", "top-purple", "stamp-n", "stripe-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", "pips-purple")
head
initial_sprite_stack = list("base-stamp-silver", "top-brown", "stamp-n", "pips-gold")
civilian
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n")
chaplain
initial_sprite_stack = list("base-stamp-silver", "top-dark", "stamp-cross", "pips-white")
internal_affairs
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n")
botanist
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-brown")
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")
janitor
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-purple")
journalist
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n")
clown
initial_sprite_stack = list("base-stamp", "top-rainbow", "stamp-n")
mime
initial_sprite_stack = list("base-stamp", "top-white", "stamp-n", "stripe-black")
pilot
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "pips-blue")
head
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "stripe-white")
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")
*/ // VOREStation Removal - defined in id_stacks_vr.dm
/obj/item/weapon/card/id/generic
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-silhouette", "clip")
// CENTCOM
/obj/item/weapon/card/id/centcom
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "pips-gold")
/obj/item/weapon/card/id/centcom/vip
initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold")
/obj/item/weapon/card/id/centcom/ERT
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "pips-red", "stripe-red")
// GENERIC COMMAND
/obj/item/weapon/card/id/silver
initial_sprite_stack = list("base-stamp-silver", "top-mime", "stamp-n-generic")
/obj/item/weapon/card/id/silver/secretary
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n")
/obj/item/weapon/card/id/silver/hop
initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "stripe-white")
// MEDICAL
/obj/item/weapon/card/id/medical
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n")
/obj/item/weapon/card/id/medical/chemist
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "pips-orange")
/obj/item/weapon/card/id/medical/geneticist
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "pips-purple")
/obj/item/weapon/card/id/medical/psych
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "pips-purple")
/obj/item/weapon/card/id/medical/emt
initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "pips-blue")
/obj/item/weapon/card/id/medical/head
initial_sprite_stack = list("base-stamp-silver", "top-medblu", "stamp-n", "stripe-gold")
/obj/item/weapon/card/id/medical/sar
initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n", "pips-medblu")
// SECURITY
/obj/item/weapon/card/id/security
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n")
/obj/item/weapon/card/id/security/detective
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "pips-brown")
/obj/item/weapon/card/id/security/warden
initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "pips-white")
/obj/item/weapon/card/id/security/head
initial_sprite_stack = list("base-stamp-silver", "top-red", "stamp-n", "stripe-gold")
// ENGINEERING
/obj/item/weapon/card/id/engineering
initial_sprite_stack = list("base-stamp", "top-orange", "stamp-n")
/obj/item/weapon/card/id/engineering/atmos
initial_sprite_stack = list("base-stamp", "top-orange", "pips-medblu", "stamp-n")
/obj/item/weapon/card/id/engineering/head
initial_sprite_stack = list("base-stamp-silver", "top-orange", "stamp-n", "stripe-gold")
// SCIENCE
/obj/item/weapon/card/id/science
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n")
/obj/item/weapon/card/id/science/roboticist
initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "pips-orange")
/obj/item/weapon/card/id/science/explorer
initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n")
/obj/item/weapon/card/id/science/head
initial_sprite_stack = list("base-stamp-silver", "top-purple", "stamp-n", "stripe-gold")
/obj/item/weapon/card/id/science/head/pathfinder
initial_sprite_stack = list("base-stamp-silver", "top-blue", "dept-exploration", "stamp-n", "pips-gold")
// CARGO
/obj/item/weapon/card/id/cargo
initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n")
/obj/item/weapon/card/id/cargo/miner
initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n", "pips-purple")
/obj/item/weapon/card/id/cargo/head
initial_sprite_stack = list("base-stamp-silver", "top-brown", "stamp-n", "pips-gold")
// CIVLIAN
/obj/item/weapon/card/id/civilian
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n")
/obj/item/weapon/card/id/civilian/chaplain
initial_sprite_stack = list("base-stamp-silver", "top-dark", "stamp-cross", "pips-white")
/obj/item/weapon/card/id/civilian/internal_affairs
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n")
/obj/item/weapon/card/id/civilian/botanist
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-brown")
/obj/item/weapon/card/id/civilian/bartender
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-dark")
/obj/item/weapon/card/id/civilian/chef
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-white")
/obj/item/weapon/card/id/civilian/janitor
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "pips-purple")
/obj/item/weapon/card/id/civilian/journalist
initial_sprite_stack = list("base-stamp", "top-green", "stamp-n")
/obj/item/weapon/card/id/civilian/clown
initial_sprite_stack = list("base-stamp", "top-rainbow", "stamp-n")
/obj/item/weapon/card/id/civilian/mime
initial_sprite_stack = list("base-stamp", "top-white", "stamp-n", "stripe-black")
/obj/item/weapon/card/id/civilian/pilot
initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "pips-blue")
/obj/item/weapon/card/id/civilian/head
initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "stripe-white")
/obj/item/weapon/card/id/syndicate
initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s")
/obj/item/weapon/card/id/syndicate/officer
initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s", "pips-gold", "stripe-gold")
code/game/objects/items/weapons/id cards/id_stacks_cit.dm
-92
View File
@@ -1,92 +0,0 @@
// This is a defines file for card sprite stacks. If a new card set comes in, this file can just be disabled and a new one made to match the new sprites.
// Generally, if the icon file is card_xxx.dmi, this filename should be sprite_stacks_xxx.dm
// Please make sure that only the relevant sprite_stacks_xxx.file is included, if more are made.
/obj/item/weapon/card
icon = 'icons/obj/card_new.dmi' // These are redefined here so that changing sprites is as easy as clicking the checkbox.
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
centcom
initial_sprite_stack = list("base-stamp", "top-blue", "dept-nanotrasen", "letter-n-command", "pips-gold")
vip
initial_sprite_stack = list("base-stamp-gold", "top-blue", "dept-vip-gold", "letter-n-command", "pips-gold")
ERT
initial_sprite_stack = list("base-stamp", "top-dark", "dept-nanotrasen", "letter-n-command")
silver
initial_sprite_stack = list("base-stamp-silver", "top-mime", "letter-n-generic")
secretary
initial_sprite_stack = list("base-stamp", "top-blue", "dept-secretary", "letter-n-command")
hop
initial_sprite_stack = list("base-stamp-silver", "top-blue", "dept-hop", "letter-n-command", "pips-gold")
medical
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "letter-n-medical")
chemist
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "letter-n-medical", "pips-engineering")
geneticist
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "letter-n-medical", "pips-science")
psych
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "letter-n-medical", "pips-science")
emt
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "letter-n-medical", "pips-command")
head
initial_sprite_stack = list("base-stamp-silver", "top-medblu", "dept-medical", "letter-n-command", "pips-gold")
sar
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-exploration", "letter-n-command", "pips-command")
security
initial_sprite_stack = list("base-stamp", "top-red", "dept-security", "letter-n-security")
detective
initial_sprite_stack = list("base-stamp", "top-red", "dept-security", "letter-n-security", "pips-cargo")
warden
initial_sprite_stack = list("base-stamp", "top-red", "dept-security", "letter-n-security", "pips-command")
head
initial_sprite_stack = list("base-stamp-silver", "top-red", "dept-security", "letter-n-command", "pips-gold")
engineering
initial_sprite_stack = list("base-stamp", "top-orange", "dept-engineering", "letter-n-engineering")
atmos
initial_sprite_stack = list("base-stamp", "top-orange", "dept-engineering", "pips-medical", "letter-n-engineering")
head
initial_sprite_stack = list("base-stamp-silver", "top-orange", "dept-engineering", "letter-n-command", "pips-gold")
science
initial_sprite_stack = list("base-stamp", "top-purple", "dept-science", "letter-n-science")
roboticist
initial_sprite_stack = list("base-stamp", "top-purple", "dept-science", "letter-n-science", "pips-engineering")
explorer
initial_sprite_stack = list("base-stamp", "top-blue", "dept-exploration", "letter-n-command")
head
initial_sprite_stack = list("base-stamp-silver", "top-purple", "dept-science", "letter-n-command", "pips-gold")
pathfinder
initial_sprite_stack = list("base-stamp-silver", "top-blue", "dept-exploration", "letter-n-command", "pips-gold")
cargo
initial_sprite_stack = list("base-stamp", "top-brown", "dept-cargo", "letter-n-cargo")
miner
initial_sprite_stack = list("base-stamp", "top-brown", "dept-cargo", "letter-n-cargo", "pips-science")
head
initial_sprite_stack = list("base-stamp-silver", "top-brown", "dept-cargo", "letter-n-command", "pips-gold")
civilian
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "letter-n-civilian")
chaplain
initial_sprite_stack = list("base-stamp-silver", "top-dark", "letter-cross", "pips-white")
internal_affairs
initial_sprite_stack = list("base-stamp", "top-green", "dept-internal-affairs", "letter-n-command")
botanist
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "letter-n-civilian", "pips-cargo")
bartender
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "letter-n-civilian", "pips-dark")
chef
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "letter-n-civilian", "pips-white")
janitor
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "letter-n-civilian", "pips-science")
journalist
initial_sprite_stack = list("base-stamp", "top-green", "dept-press", "letter-n-civilian")
clown
initial_sprite_stack = list("base-stamp", "top-pink", "dept-clown", "letter-n-clown")
mime
initial_sprite_stack = list("base-stamp", "top-white", "letter-n-mime")
pilot
initial_sprite_stack = list("base-stamp", "top-generic", "dept-pilot", "letter-n-command", "pips-command")
head
initial_sprite_stack = list("base-stamp-silver", "top-command", "letter-n-command", "pips-civilian")
code/game/objects/items/weapons/id cards/id_stacks_deptname.dm
-92
View File
@@ -1,92 +0,0 @@
// This is a defines file for card sprite stacks. If a new card set comes in, this file can just be disabled and a new one made to match the new sprites.
// Generally, if the icon file is card_xxx.dmi, this filename should be sprite_stacks_xxx.dm
// Please make sure that only the relevant sprite_stacks_xxx.file is included, if more are made.
/obj/item/weapon/card
icon = 'icons/obj/card_new.dmi' // These are redefined here so that changing sprites is as easy as clicking the checkbox.
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
centcom
initial_sprite_stack = list("base-stamp", "top-blue", "dept-nanotrasen", "stamp-n", "pips-gold")
vip
initial_sprite_stack = list("base-stamp-gold", "dept-vip", "top-blue", "stamp-n", "pips-gold")
ERT
initial_sprite_stack = list("base-stamp", "top-dark", "dept-ert", "stamp-n")
silver
initial_sprite_stack = list("base-stamp-silver", "top-mime", "stamp-n-generic")
secretary
initial_sprite_stack = list("base-stamp", "top-blue", "dept-secretary", "stamp-n")
hop
initial_sprite_stack = list("base-stamp-silver", "top-blue", "dept-hop", "stamp-n", "pips-gold")
medical
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "stamp-n")
chemist
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "stamp-n", "pips-engineering")
geneticist
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "stamp-n", "pips-science")
psych
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "stamp-n", "pips-science")
emt
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-medical", "stamp-n", "pips-command")
head
initial_sprite_stack = list("base-stamp-silver", "top-medblu", "dept-medical", "stamp-n", "pips-gold")
sar
initial_sprite_stack = list("base-stamp", "top-medblu", "dept-exploration", "stamp-n", "pips-command")
security
initial_sprite_stack = list("base-stamp", "top-red", "dept-security", "stamp-n")
detective
initial_sprite_stack = list("base-stamp", "top-red", "dept-security", "stamp-n", "pips-cargo")
warden
initial_sprite_stack = list("base-stamp", "top-red", "dept-security", "stamp-n", "pips-command")
head
initial_sprite_stack = list("base-stamp-silver", "top-red", "dept-security", "stamp-n", "pips-gold")
engineering
initial_sprite_stack = list("base-stamp", "top-orange", "dept-engineering", "stamp-n")
atmos
initial_sprite_stack = list("base-stamp", "top-orange", "dept-engineering", "pips-medical", "stamp-n")
head
initial_sprite_stack = list("base-stamp-silver", "top-orange", "dept-engineering", "stamp-n", "pips-gold")
science
initial_sprite_stack = list("base-stamp", "top-purple", "dept-science", "stamp-n")
roboticist
initial_sprite_stack = list("base-stamp", "top-purple", "dept-science", "stamp-n", "pips-engineering")
explorer
initial_sprite_stack = list("base-stamp", "top-blue", "dept-exploration", "stamp-n")
head
initial_sprite_stack = list("base-stamp-silver", "top-purple", "dept-science", "stamp-n", "pips-gold")
pathfinder
initial_sprite_stack = list("base-stamp-silver", "top-blue", "dept-exploration", "stamp-n", "pips-gold")
cargo
initial_sprite_stack = list("base-stamp", "top-brown", "dept-cargo", "stamp-n")
miner
initial_sprite_stack = list("base-stamp", "top-brown", "dept-cargo", "stamp-n", "pips-science")
head
initial_sprite_stack = list("base-stamp-silver", "top-brown", "dept-cargo", "stamp-n", "pips-gold")
civilian
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "stamp-n")
chaplain
initial_sprite_stack = list("base-stamp-silver", "top-dark", "letter-cross", "pips-white")
internal_affairs
initial_sprite_stack = list("base-stamp", "top-green", "dept-internal-affairs", "stamp-n")
botanist
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "stamp-n", "pips-cargo")
bartender
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "stamp-n", "pips-dark")
chef
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "stamp-n", "pips-white")
janitor
initial_sprite_stack = list("base-stamp", "top-green", "dept-civilian", "stamp-n", "pips-science")
journalist
initial_sprite_stack = list("base-stamp", "top-green", "dept-press", "stamp-n")
clown
initial_sprite_stack = list("base-stamp", "top-pink", "dept-clown", "stamp-n")
mime
initial_sprite_stack = list("base-stamp", "top-white", "stamp-n-mime")
pilot
initial_sprite_stack = list("base-stamp", "top-generic", "dept-pilot", "stamp-n", "pips-command")
head
initial_sprite_stack = list("base-stamp-silver", "top-command", "stamp-n", "pips-civilian")