diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 7d7d86fedc2..cda81f977f9 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -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 diff --git a/code/datums/outfits/jobs/civilian_vr.dm b/code/datums/outfits/jobs/civilian_vr.dm index 7d39ae8c1b6..3acfffdfd15 100644 --- a/code/datums/outfits/jobs/civilian_vr.dm +++ b/code/datums/outfits/jobs/civilian_vr.dm @@ -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 diff --git a/code/datums/outfits/jobs/command_vr.dm b/code/datums/outfits/jobs/command_vr.dm new file mode 100644 index 00000000000..5e90123ffcc --- /dev/null +++ b/code/datums/outfits/jobs/command_vr.dm @@ -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 \ No newline at end of file diff --git a/code/datums/outfits/jobs/medical_vr.dm b/code/datums/outfits/jobs/medical_vr.dm new file mode 100644 index 00000000000..e9b2c1a0d02 --- /dev/null +++ b/code/datums/outfits/jobs/medical_vr.dm @@ -0,0 +1,2 @@ +/decl/hierarchy/outfit/job/medical/doctor/virologist + id_type = /obj/item/weapon/card/id/medical/virologist \ No newline at end of file diff --git a/code/datums/outfits/jobs/science_vr.dm b/code/datums/outfits/jobs/science_vr.dm new file mode 100644 index 00000000000..cf0e9e4b3a6 --- /dev/null +++ b/code/datums/outfits/jobs/science_vr.dm @@ -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 \ No newline at end of file diff --git a/code/datums/outfits/jobs/special_vr.dm b/code/datums/outfits/jobs/special_vr.dm index 010010291dd..6dea4e4cfa9 100644 --- a/code/datums/outfits/jobs/special_vr.dm +++ b/code/datums/outfits/jobs/special_vr.dm @@ -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) diff --git a/code/datums/outfits/outfit_vr.dm b/code/datums/outfits/outfit_vr.dm index 455d84c90e1..12eb237a0ca 100644 --- a/code/datums/outfits/outfit_vr.dm +++ b/code/datums/outfits/outfit_vr.dm @@ -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 diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index beb4f477f89..3d5e9cb95e3 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -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, diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index c073f6cba3f..4567cfe0381 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -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") \ No newline at end of file + initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s", "pips-gold", "stripe-gold") + */ // VOREStation Removal - defined in id_stacks_vr.dm \ No newline at end of file diff --git a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm new file mode 100644 index 00000000000..12442a353f3 --- /dev/null +++ b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm @@ -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") \ No newline at end of file diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index 89ea143f504..7c671ac58ad 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -136,7 +136,7 @@ /decl/hierarchy/outfit/job/talon_captain name = OUTFIT_JOB_NAME("Talon Captain") - id_type = /obj/item/weapon/card/id/gold + id_type = /obj/item/weapon/card/id/talon/captain id_slot = slot_wear_id pda_type = null @@ -151,6 +151,7 @@ /decl/hierarchy/outfit/job/talon_pilot name = OUTFIT_JOB_NAME("Talon Pilot") + id_type = /obj/item/weapon/card/id/talon/pilot id_slot = slot_wear_id pda_type = null flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL @@ -167,7 +168,7 @@ name = OUTFIT_JOB_NAME("Talon Doctor") hierarchy_type = /decl/hierarchy/outfit/job - id_type = /obj/item/weapon/card/id/medical + id_type = /obj/item/weapon/card/id/talon/doctor id_slot = slot_wear_id pda_type = null @@ -185,7 +186,7 @@ name = OUTFIT_JOB_NAME("Talon Security") hierarchy_type = /decl/hierarchy/outfit/job - id_type = /obj/item/weapon/card/id/security + id_type = /obj/item/weapon/card/id/talon/officer id_slot = slot_wear_id pda_type = null backpack_contents = list(/obj/item/weapon/handcuffs = 1) @@ -203,7 +204,7 @@ name = OUTFIT_JOB_NAME("Talon Engineer") hierarchy_type = /decl/hierarchy/outfit/job - id_type = /obj/item/weapon/card/id/engineering + id_type = /obj/item/weapon/card/id/talon/engineer id_slot = slot_wear_id pda_type = null flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL diff --git a/vorestation.dme b/vorestation.dme index c7811704c09..c437a9a9fdd 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -394,11 +394,14 @@ #include "code\datums\outfits\jobs\civilian.dm" #include "code\datums\outfits\jobs\civilian_vr.dm" #include "code\datums\outfits\jobs\command.dm" +#include "code\datums\outfits\jobs\command_vr.dm" #include "code\datums\outfits\jobs\engineering.dm" #include "code\datums\outfits\jobs\job.dm" #include "code\datums\outfits\jobs\medical.dm" +#include "code\datums\outfits\jobs\medical_vr.dm" #include "code\datums\outfits\jobs\misc.dm" #include "code\datums\outfits\jobs\science.dm" +#include "code\datums\outfits\jobs\science_vr.dm" #include "code\datums\outfits\jobs\security.dm" #include "code\datums\outfits\jobs\special_vr.dm" #include "code\datums\outfits\military\fleet.dm" @@ -1308,6 +1311,7 @@ #include "code\game\objects\items\weapons\id cards\cards.dm" #include "code\game\objects\items\weapons\id cards\cards_vr.dm" #include "code\game\objects\items\weapons\id cards\id_stacks.dm" +#include "code\game\objects\items\weapons\id cards\id_stacks_vr.dm" #include "code\game\objects\items\weapons\id cards\station_ids.dm" #include "code\game\objects\items\weapons\id cards\station_ids_vr.dm" #include "code\game\objects\items\weapons\id cards\syndicate_ids.dm" @@ -1707,9 +1711,9 @@ #include "code\modules\ai\ai_holder_targeting_vr.dm" #include "code\modules\ai\interfaces.dm" #include "code\modules\ai\say_list.dm" -#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" -#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm" -#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm" +#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm" +#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm" +#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\alarm\alarm.dm" #include "code\modules\alarm\alarm_handler.dm" #include "code\modules\alarm\atmosphere_alarm.dm"