From 5772b95cc5700689feab2b8304dbcbc96c702046 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 19 Dec 2020 21:14:42 -0500 Subject: [PATCH] Some ERT Tweaks --- code/datums/outfits/jobs/special_vr.dm | 12 +++++++++ code/game/jobs/job/special_vr.dm | 36 +++++++------------------- maps/submaps/admin_use_vr/ert.dmm | 27 ++++++------------- 3 files changed, 30 insertions(+), 45 deletions(-) diff --git a/code/datums/outfits/jobs/special_vr.dm b/code/datums/outfits/jobs/special_vr.dm index dd8316358b6..89c4883e92a 100644 --- a/code/datums/outfits/jobs/special_vr.dm +++ b/code/datums/outfits/jobs/special_vr.dm @@ -9,6 +9,18 @@ id_type = /obj/item/weapon/card/id/centcom pda_type = /obj/item/device/pda/centcom +/decl/hierarchy/outfit/job/emergency_responder + name = OUTFIT_JOB_NAME("Emergency Responder") + uniform = /obj/item/clothing/under/ert + shoes = /obj/item/clothing/shoes/boots/swat + gloves = /obj/item/clothing/gloves/swat + l_ear = /obj/item/device/radio/headset/ert + belt = /obj/item/weapon/gun/energy/gun + glasses = /obj/item/clothing/glasses/sunglasses + back = /obj/item/weapon/storage/backpack/satchel + id_type = /obj/item/weapon/card/id/centcom/ERT + pda_type = /obj/item/device/pda/centcom + /decl/hierarchy/outfit/job/clown name = OUTFIT_JOB_NAME("Clown") uniform = /obj/item/clothing/under/rank/clown diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm index d2de3db85c0..32c5893c228 100644 --- a/code/game/jobs/job/special_vr.dm +++ b/code/game/jobs/job/special_vr.dm @@ -24,47 +24,31 @@ get_access() return get_all_accesses().Copy() -/*/datum/job/centcom_visitor //For Pleasure // You mean for admin abuse... -Ace - title = "CentCom Visitor" - department = "Civilian" - head_position = 1 +/datum/job/emergency_responder //For staff managing/leading ERTs + title = "Emergency Responder" + departments = list("Central Command") + department_accounts = list(DEPARTMENT_COMMAND, DEPARTMENT_ENGINEERING, DEPARTMENT_MEDICAL, DEPARTMENT_RESEARCH, DEPARTMENT_SECURITY, DEPARTMENT_CARGO, DEPARTMENT_PLANET, DEPARTMENT_CIVILIAN) faction = "Station" total_positions = 2 spawn_positions = 1 supervisors = "company officials and Corporate Regulations" selection_color = "#1D1D4F" - idtype = /obj/item/weapon/card/id/centcom access = list() minimal_access = list() minimal_player_age = 14 economic_modifier = 20 whitelist_only = 1 latejoin_only = 1 + outfit_type = /decl/hierarchy/outfit/job/centcom_officer + job_description = "Emergency Responders are usually called in to deal with on-station emergencies that the crew require assistance to deal with." - minimum_character_age = 25 - ideal_character_age = 40 + minimum_character_age = 18 + ideal_character_age = 30 - equip(var/mob/living/carbon/human/H) - if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(H), slot_l_ear) - switch(H.backbag) - if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) - if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom, slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/device/pda/centcom(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/omnihud(H), slot_l_store) - - H.implant_loyalty() - - return 1 + pto_type = PTO_CIVILIAN get_access() - var/access = get_all_accesses() - return access*/ + return get_all_accesses().Copy() /datum/job/clown title = "Clown" diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 350005bbbcf..0081799cc32 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -5270,25 +5270,13 @@ /area/ship/ert/atmos) "Lq" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, -/obj/item/weapon/gun/energy/gun/martin{ - battery_lock = 0 - }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LA" = ( @@ -5601,6 +5589,7 @@ "NI" = ( /obj/structure/table/rack, /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, +/obj/item/weapon/storage/belt/explorer/pathfinder, /turf/simulated/floor/wood, /area/ship/ert/commander) "NJ" = ( @@ -6757,7 +6746,7 @@ /turf/simulated/floor/wood, /area/ship/ert/commander) "Wd" = ( -/obj/machinery/telecomms/relay/preset/centcom/tether, +/obj/machinery/telecomms/relay, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "Wj" = (