From 26d35b060cbbe7f43a3ce6c020e1ecf19f5c183b Mon Sep 17 00:00:00 2001 From: skoglol <33292112+kriskog@users.noreply.github.com> Date: Sat, 30 Nov 2019 12:54:57 +0100 Subject: [PATCH] Debug outfit updates (#47923) * New debug ID, cells in BRPED * Debug glasses * admin rcd --- code/game/objects/items/cards_ids.dm | 12 ++++++ code/game/objects/items/storage/boxes.dm | 5 ++- code/modules/clothing/glasses/_glasses.dm | 46 +++++++++++++++++++++++ code/modules/clothing/outfits/standard.dm | 10 +++-- code/modules/research/stock_parts.dm | 4 ++ 5 files changed, 72 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 4c67037673f..d1e84a85b44 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -569,6 +569,18 @@ update_label() access = get_all_accesses() . = ..() +/obj/item/card/id/debug + name = "\improper Debug ID" + desc = "A debug ID card. Has ALL the all access, you really shouldn't have this." + icon_state = "ert_janitor" + assignment = "Jannie" + uses_overlays = FALSE + +/obj/item/card/id/debug/Initialize() + access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access() + registered_account = SSeconomy.get_dep_account(ACCOUNT_CAR) + . = ..() + /obj/item/card/id/prisoner name = "prisoner ID card" id_type_name = "prisoner ID card" diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index e0bf3280bc2..05d565b270d 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1150,11 +1150,12 @@ /obj/item/storage/box/debugtools/PopulateContents() var/static/items_inside = list( /obj/item/flashlight/emp/debug=1,\ + /obj/item/pda=1,\ + /obj/item/modular_computer/tablet/preset/advanced=1,\ /obj/item/geiger_counter=1,\ + /obj/item/construction/rcd/combat/admin=1,\ /obj/item/pipe_dispenser=1,\ /obj/item/card/emag=1,\ - /obj/item/card/id/syndicate/nuke_leader=1,\ - /obj/item/card/id/departmental_budget/car=1,\ /obj/item/stack/spacecash/c1000=50,\ /obj/item/healthanalyzer/advanced=1,\ /obj/item/disk/tech_disk/debug=1,\ diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index b8d5bd93af0..6693d192741 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -468,3 +468,49 @@ add_client_colour(G.glass_colour_type) else remove_client_colour(G.glass_colour_type) + +/obj/item/clothing/glasses/debug + name = "debug glasses" + desc = "Medical, security and diagnostic hud. Alt click to toggle xray." + icon_state = "nvgmeson" + item_state = "nvgmeson" + flags_cover = GLASSESCOVERSEYES + darkness_view = 8 + flash_protect = FLASH_PROTECTION_WELDER + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + glass_colour_type = FALSE + clothing_flags = SCAN_REAGENTS + vision_flags = SEE_TURFS + var/list/hudlist = list(DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_ADVANCED, DATA_HUD_SECURITY_ADVANCED) + var/xray = FALSE + +/obj/item/clothing/glasses/debug/equipped(mob/user, slot) + . = ..() + if(slot != ITEM_SLOT_EYES) + return + if(ishuman(user)) + for(var/hud in hudlist) + var/datum/atom_hud/H = GLOB.huds[hud] + H.add_hud_to(user) + ADD_TRAIT(user, TRAIT_MEDICAL_HUD, GLASSES_TRAIT) + ADD_TRAIT(user, TRAIT_SECURITY_HUD, GLASSES_TRAIT) + +/obj/item/clothing/glasses/debug/dropped(mob/user) + . = ..() + REMOVE_TRAIT(user, TRAIT_MEDICAL_HUD, GLASSES_TRAIT) + REMOVE_TRAIT(user, TRAIT_SECURITY_HUD, GLASSES_TRAIT) + if(ishuman(user)) + for(var/hud in hudlist) + var/datum/atom_hud/H = GLOB.huds[hud] + H.remove_hud_from(user) + +/obj/item/clothing/glasses/debug/AltClick(mob/user) + . = ..() + if(ishuman(user)) + if(xray) + vision_flags -= SEE_MOBS|SEE_OBJS + else + vision_flags += SEE_MOBS|SEE_OBJS + xray = !xray + var/mob/living/carbon/human/H = user + H.update_sight() diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index b3acc34dc72..7f87266c7d8 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -423,22 +423,26 @@ name = "Debug outfit" uniform = /obj/item/clothing/under/misc/patriotsuit suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite/debug - glasses = /obj/item/clothing/glasses/meson/night + glasses = /obj/item/clothing/glasses/debug ears = /obj/item/radio/headset/headset_cent/commander mask = /obj/item/clothing/mask/gas/welding/up gloves = /obj/item/clothing/gloves/combat belt = /obj/item/storage/belt/utility/chief/full shoes = /obj/item/clothing/shoes/magboots/advance - id = /obj/item/card/id/ert + id = /obj/item/card/id/debug suit_store = /obj/item/tank/internals/oxygen back = /obj/item/storage/backpack/holding box = /obj/item/storage/box/debugtools internals_slot = ITEM_SLOT_SUITSTORE backpack_contents = list( - /obj/item/construction/rcd/combat=1,\ /obj/item/melee/transforming/energy/axe=1,\ /obj/item/storage/part_replacer/bluespace/tier4=1,\ /obj/item/gun/magic/wand/resurrection/debug=1,\ /obj/item/gun/magic/wand/death/debug=1,\ /obj/item/debug/human_spawner=1 ) + +/datum/outfit/debug/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + var/obj/item/card/id/W = H.wear_id + W.registered_name = H.real_name + W.update_label() diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 9b41c4aec4d..352d3010120 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -59,6 +59,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi new /obj/item/stock_parts/manipulator(src) new /obj/item/stock_parts/micro_laser(src) new /obj/item/stock_parts/matter_bin(src) + new /obj/item/stock_parts/cell/high(src) /obj/item/storage/part_replacer/bluespace/tier2 @@ -69,6 +70,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi new /obj/item/stock_parts/manipulator/nano(src) new /obj/item/stock_parts/micro_laser/high(src) new /obj/item/stock_parts/matter_bin/adv(src) + new /obj/item/stock_parts/cell/super(src) /obj/item/storage/part_replacer/bluespace/tier3 @@ -79,6 +81,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi new /obj/item/stock_parts/manipulator/pico(src) new /obj/item/stock_parts/micro_laser/ultra(src) new /obj/item/stock_parts/matter_bin/super(src) + new /obj/item/stock_parts/cell/hyper(src) /obj/item/storage/part_replacer/bluespace/tier4 @@ -89,6 +92,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi new /obj/item/stock_parts/manipulator/femto(src) new /obj/item/stock_parts/micro_laser/quadultra(src) new /obj/item/stock_parts/matter_bin/bluespace(src) + new /obj/item/stock_parts/cell/bluespace(src) /obj/item/storage/part_replacer/cargo //used in a cargo crate