From f249133c8824ca0544c50b384bd3c31e2ed2789a Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Wed, 24 Mar 2021 18:17:46 +0000 Subject: [PATCH 1/3] [MIRROR] Patches new ID card code --- .../objects/items/weapons/id cards/cards.dm | 12 ++ .../items/weapons/id cards/id_stacks.dm | 146 ++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 code/game/objects/items/weapons/id cards/id_stacks.dm diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index fa56f6ccc1..4d80abeb65 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -19,6 +19,18 @@ slot_flags = SLOT_EARS var/associated_account_number = 0 +<<<<<<< HEAD +||||||| parent of ed17ffc0ba... Merge pull request #10008 from VOREStation/upstream-merge-8008 + var/list/initial_sprite_stack = list("") + var/base_icon = "icons/obj/card_new.dmi" + var/list/sprite_stack + +======= + var/list/initial_sprite_stack = list("") + var/base_icon = 'icons/obj/card_new.dmi' + var/list/sprite_stack + +>>>>>>> ed17ffc0ba... Merge pull request #10008 from VOREStation/upstream-merge-8008 var/list/files = list( ) drop_sound = 'sound/items/drop/card.ogg' pickup_sound = 'sound/items/pickup/card.ogg' diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm new file mode 100644 index 0000000000..8d18d7b699 --- /dev/null +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -0,0 +1,146 @@ +// 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. + +/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") From 04f4302dfa35961c3005e308ad188351ce0ec465 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 27 Mar 2021 22:58:50 -0400 Subject: [PATCH 2/3] Delete id_stacks_cit.dm --- .../items/weapons/id cards/id_stacks_cit.dm | 92 ------------------- 1 file changed, 92 deletions(-) delete mode 100644 code/game/objects/items/weapons/id cards/id_stacks_cit.dm diff --git a/code/game/objects/items/weapons/id cards/id_stacks_cit.dm b/code/game/objects/items/weapons/id cards/id_stacks_cit.dm deleted file mode 100644 index a35b1febf9..0000000000 --- a/code/game/objects/items/weapons/id cards/id_stacks_cit.dm +++ /dev/null @@ -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") \ No newline at end of file From ace9beb3d1c89a8d49484f02489d57c43ac2024f Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 27 Mar 2021 22:59:17 -0400 Subject: [PATCH 3/3] Delete id_stacks_deptname.dm --- .../weapons/id cards/id_stacks_deptname.dm | 92 ------------------- 1 file changed, 92 deletions(-) delete mode 100644 code/game/objects/items/weapons/id cards/id_stacks_deptname.dm diff --git a/code/game/objects/items/weapons/id cards/id_stacks_deptname.dm b/code/game/objects/items/weapons/id cards/id_stacks_deptname.dm deleted file mode 100644 index bce7340ecc..0000000000 --- a/code/game/objects/items/weapons/id cards/id_stacks_deptname.dm +++ /dev/null @@ -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") \ No newline at end of file