From 695e39e30c44cf401c3d60532261aa42f104a1f3 Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 24 Dec 2022 03:36:01 -0500 Subject: [PATCH 01/10] Fixes some Oversights --- code/datums/supplypacks/munitions_vr.dm | 6 + code/datums/supplypacks/supply.dm | 5 + code/datums/supplypacks/voidsuits_vr.dm | 13 ++ code/game/jobs/access_datum_vr.dm | 4 + .../game/objects/items/devices/radio/radio.dm | 4 + .../crates_lockers/closets/misc_vr.dm | 8 + maps/groundbase/gb-z3.dmm | 6 + maps/groundbase/groundbase_telecomms.dm | 7 +- maps/offmap_vr/talon/talon_v2.dmm | 195 ++++++++---------- maps/stellar_delight/stellar_delight1.dmm | 21 ++ .../stellar_delight_telecomms.dm | 4 +- maps/submaps/admin_use_vr/ert.dmm | 28 ++- maps/tether/tether_telecomms.dm | 4 +- 13 files changed, 178 insertions(+), 127 deletions(-) diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm index d53a496928..3184edb7a2 100644 --- a/code/datums/supplypacks/munitions_vr.dm +++ b/code/datums/supplypacks/munitions_vr.dm @@ -1,3 +1,4 @@ +/* /datum/supply_pack/munitions/expeditionguns name = "Frontier phaser (station-locked) crate" contains = list( @@ -17,7 +18,12 @@ cost = 20 containertype = /obj/structure/closet/crate/secure containername = "phaser handbow crate" +<<<<<<< HEAD access = access_explorer +======= + access = access_security +*/ +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes /datum/supply_pack/munitions/ofd_charge_emp name = "OFD Charge - EMP" diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 70f8386a91..27428ab0f9 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -178,8 +178,13 @@ ) cost=25 containertype = /obj/structure/closet/crate/secure/xion +<<<<<<< HEAD containername = "Explorer equipment" access = access_explorer +======= + containername = "Away Team equipment" + access = list(access_eva, access_explorer) +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes /datum/supply_pack/pilotgear name= "Pilot gear" diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm index a769cc805d..37ccf6d197 100644 --- a/code/datums/supplypacks/voidsuits_vr.dm +++ b/code/datums/supplypacks/voidsuits_vr.dm @@ -9,8 +9,13 @@ ) cost = 45 containertype = /obj/structure/closet/crate/secure +<<<<<<< HEAD containername = "Exploration voidsuit crate" access = access_explorer +======= + containername = "Away Team voidsuit crate" + access = list(access_eva, access_explorer) +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes /datum/supply_pack/voidsuits/explorer_medic name = "Expedition Medic voidsuits" @@ -105,11 +110,19 @@ ) cost = 150 containertype = /obj/structure/closet/crate/secure +<<<<<<< HEAD name = "Solgov exploration voidsuit crate" access = access_explorer /datum/supply_pack/voidsuits/solgov_engineer name = "Solgov engineering voidsuit" +======= + name = "Commonwealth exploration voidsuit crate" + access = list(access_eva, access_explorer) + +/datum/supply_pack/voidsuits/com_engineer + name = "Commonwealth engineering voidsuit" +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes contains = list( /obj/item/clothing/suit/space/void/engineering/alt2, /obj/item/clothing/head/helmet/space/void/engineering/alt2 diff --git a/code/game/jobs/access_datum_vr.dm b/code/game/jobs/access_datum_vr.dm index 4500e061a5..4fe3d0b169 100644 --- a/code/game/jobs/access_datum_vr.dm +++ b/code/game/jobs/access_datum_vr.dm @@ -2,7 +2,11 @@ var/const/access_explorer = 43 /datum/access/explorer id = access_explorer +<<<<<<< HEAD desc = "Explorer" +======= + desc = "Away Team" +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes region = ACCESS_REGION_GENERAL /var/const/access_pathfinder = 44 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 147b7327e8..e36372da6d 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -14,7 +14,11 @@ var/global/list/default_internal_channels = list( num2text(SCI_FREQ) = list(access_tox, access_robotics, access_xenobiology), num2text(SUP_FREQ) = list(access_cargo, access_mining_station), num2text(SRV_FREQ) = list(access_janitor, access_library, access_hydroponics, access_bar, access_kitchen), +<<<<<<< HEAD num2text(EXP_FREQ) = list(access_explorer, access_pilot) +======= + num2text(EXP_FREQ) = list(access_explorer) //VOREStation Edit +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes ) var/global/list/default_medbay_channels = list( diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 73becfc093..8dd56c7147 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -51,7 +51,11 @@ * Explorer */ /obj/structure/closet/secure_closet/explorer +<<<<<<< HEAD name = "explorer locker" +======= + name = "away team locker" +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes req_access = list(access_explorer) closet_appearance = /decl/closet_appearance/secure_closet/expedition/explorer @@ -93,7 +97,11 @@ */ /obj/structure/closet/secure_closet/pathfinder name = "pathfinder locker" +<<<<<<< HEAD req_access = list(access_pathfinder) +======= + req_access = list(access_explorer) +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder starts_with = list( diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 88cbfaf5bb..aa39c06190 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -1464,6 +1464,12 @@ lol /obj/structure/cable/yellow{ icon_state = "4-8" }, +<<<<<<< HEAD +======= +/obj/item/weapon/storage/box/nifsofts_pilot, +/obj/item/device/multitool/station_buffered, +/obj/structure/table/steel, +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) "zL" = ( diff --git a/maps/groundbase/groundbase_telecomms.dm b/maps/groundbase/groundbase_telecomms.dm index 6e509b0262..d5e4487c77 100644 --- a/maps/groundbase/groundbase_telecomms.dm +++ b/maps/groundbase/groundbase_telecomms.dm @@ -77,11 +77,16 @@ num2text(EXP_FREQ) = list(access_explorer) ) +<<<<<<< HEAD /obj/item/device/multitool/groundbase_buffered name = "pre-linked multitool (groundbase hub)" +======= +/obj/item/device/multitool/station_buffered + name = "pre-linked multitool (Rascal's Pass hub)" +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes desc = "This multitool has already been linked to the groundbase telecomms hub and can be used to configure one (1) relay." -/obj/item/device/multitool/groundbase_buffered/Initialize() +/obj/item/device/multitool/station_buffered/Initialize() . = ..() buffer = locate(/obj/machinery/telecomms/hub/preset/groundbase) diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index 02291ceeea..2de130208f 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -2,6 +2,14 @@ "aa" = ( /turf/space, /area/space) +"ab" = ( +/obj/structure/dogbed, +/mob/living/simple_mob/animal/passive/dog/corgi/puppy{ + desc = "That's Hendrickson, warden of the Talon's brig. No schemes can escape the watchful gleam of this corgi's deep, dark eyes."; + name = "Hendrickson" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) "ac" = ( /obj/machinery/computer/ship/helm{ req_one_access = list(301) @@ -59,6 +67,11 @@ }, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) +"ai" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/under/syndicate/combat, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) "aj" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/green{ @@ -356,6 +369,14 @@ /obj/random/maintenance/engineering, /turf/simulated/floor/plating, /area/talon_v2/engineering/star_store) +"aM" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/shoes/magboots, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) "aN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -460,6 +481,24 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) +"aX" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/weapon/cell/device/weapon, +/obj/item/clothing/accessory/holster/waist, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"aY" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/gun/energy/netgun, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) "aZ" = ( /obj/machinery/shipsensors{ dir = 1 @@ -479,6 +518,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/maintenance/wing_port) +"bb" = ( +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/table/rack/steel, +/obj/item/device/spaceflare, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) "bc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -506,6 +557,20 @@ }, /turf/simulated/wall/shull, /area/talon_v2/ofd_ops) +"be" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/weapon/cell/device/weapon, +/obj/item/clothing/accessory/holster/waist, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) "bf" = ( /obj/structure/railing/grey, /obj/machinery/light{ @@ -555,6 +620,11 @@ /obj/structure/closet/walllocker_double/hydrant/south, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) +"bj" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/gun/energy/gun, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) "bn" = ( /obj/structure/hull_corner{ dir = 4 @@ -5809,21 +5879,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"sv" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon, -/obj/item/clothing/accessory/holster/waist, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "sw" = ( /obj/machinery/light_switch{ dir = 8; @@ -7617,16 +7672,6 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering) -"yq" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/syndicate/black, -/obj/item/clothing/head/helmet/space/syndicate/black, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "yr" = ( /obj/effect/overmap/visitable/ship/talon, /turf/space, @@ -8062,11 +8107,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/port) -"zL" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "zM" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/empty, @@ -9175,21 +9215,6 @@ /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /turf/simulated/floor/plating, /area/talon_v2/engineering/starboard) -"Ef" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon, -/obj/item/clothing/accessory/holster/waist, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "Ei" = ( /obj/machinery/door/airlock/mining{ id_tag = "talon_minerdoor"; @@ -9472,15 +9497,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) -"EV" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/shoes/leg_guard/combat, -/obj/item/clothing/gloves/arm_guard/combat, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/suit/armor/combat, -/obj/item/clothing/head/helmet/combat, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "EX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10548,22 +10564,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/star) -"HV" = ( -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/table/rack/steel, -/obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/device/spaceflare, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "HW" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -12693,20 +12693,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/refining) -"Oi" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon, -/obj/item/clothing/accessory/holster/waist, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "Oj" = ( /turf/simulated/wall/shull, /area/talon_v2/armory) @@ -13914,11 +13900,6 @@ }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/meditation) -"Sa" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/gun, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "Sb" = ( /obj/structure/bed/chair/wood, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14987,12 +14968,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/space) -"Vv" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/accessory/holster/machete, -/obj/item/weapon/material/knife/machete, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) "Vw" = ( /obj/structure/cable/green{ d1 = 1; @@ -15949,14 +15924,6 @@ "Yu" = ( /turf/simulated/wall/rshull, /area/talon_v2/maintenance/wing_port) -"Yv" = ( -/mob/living/simple_mob/animal/passive/dog/corgi/puppy{ - desc = "That's Hendrickson, warden of the Talon's brig. No schemes can escape the watchful gleam of this corgi's deep, dark eyes."; - name = "Hendrickson" - }, -/obj/structure/dogbed, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) "Yw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -24250,7 +24217,7 @@ Si Oj PC OP -Vv +Qu OP Qu Zc @@ -24658,7 +24625,7 @@ XQ Xm db qm -Yv +ab rq tA uF @@ -24674,11 +24641,11 @@ NW Rp Si Nh -EV +ai OP -yq +aM OP -HV +bb Zc ZB Jv @@ -24958,11 +24925,11 @@ NW Rp Si Nh -sv +Qu OP -Oi +aX OP -Ef +be Zc BI Ds @@ -25100,11 +25067,11 @@ Dd Ew eS Oj -zL +Qu SN -zL +aY XW -Sa +bj Zc WY Ds diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index b7bc90fe65..220d8556ef 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -191,8 +191,29 @@ /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "ay" = ( +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/pathfinder) +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/item/device/multitool/station_buffered{ + pixel_y = 2 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) +"az" = ( +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/eris, +/area/rnd/xenobiology/xenoflora) +>>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes "aA" = ( /obj/structure/cable{ icon_state = "1-2" diff --git a/maps/stellar_delight/stellar_delight_telecomms.dm b/maps/stellar_delight/stellar_delight_telecomms.dm index 7ddefa3365..4d39eeaf24 100644 --- a/maps/stellar_delight/stellar_delight_telecomms.dm +++ b/maps/stellar_delight/stellar_delight_telecomms.dm @@ -82,11 +82,11 @@ num2text(EXP_FREQ) = list(access_explorer) ) -/obj/item/device/multitool/sd_buffered +/obj/item/device/multitool/station_buffered name = "pre-linked multitool (sd hub)" desc = "This multitool has already been linked to the SD telecomms hub and can be used to configure one (1) relay." -/obj/item/device/multitool/sd_buffered/Initialize() +/obj/item/device/multitool/station_buffered/Initialize() . = ..() buffer = locate(/obj/machinery/telecomms/hub/preset/sd) diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index b56d1f7575..f1f8b58a9e 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -360,9 +360,15 @@ /obj/item/weapon/tank/emergency/oxygen/double, /obj/item/weapon/tank/emergency/oxygen/double, /obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/storage/belt/utility/holding, -/obj/item/weapon/storage/belt/utility/holding, -/obj/item/weapon/storage/belt/utility/holding, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "aC" = ( @@ -474,9 +480,15 @@ }, /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/belt/medical/holding, -/obj/item/weapon/storage/belt/medical/holding, -/obj/item/weapon/storage/belt/medical/holding, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, +/obj/item/weapon/storage/belt/explorer/pathfinder{ + name = "ERT belt" + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "aI" = ( @@ -499,7 +511,7 @@ /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) "aJ" = ( -/obj/item/device/multitool/tether_buffered, +/obj/item/device/multitool/station_buffered, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "aK" = ( @@ -6791,7 +6803,7 @@ /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid, /obj/item/weapon/storage/belt/explorer/pathfinder, /obj/item/weapon/storage/belt/explorer/pathfinder{ - name = "ERT Commander's belt" + name = "ERT belt" }, /turf/simulated/floor/wood, /area/ship/ert/commander) diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index 9adb24aed1..2ebf78f149 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -82,10 +82,10 @@ num2text(EXP_FREQ) = list(access_explorer) ) -/obj/item/device/multitool/tether_buffered +/obj/item/device/multitool/station_buffered name = "pre-linked multitool (tether hub)" desc = "This multitool has already been linked to the Tether telecomms hub and can be used to configure one (1) relay." -/obj/item/device/multitool/tether_buffered/Initialize() +/obj/item/device/multitool/station_buffered/Initialize() . = ..() buffer = locate(/obj/machinery/telecomms/hub/preset/tether) From a2454795f95a3124dfab0add480dfdca9c2eba62 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 24 Jan 2023 17:16:00 -0700 Subject: [PATCH 02/10] no --- code/datums/supplypacks/munitions_vr.dm | 30 +++++++++++-------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm index 3184edb7a2..f18f8a6044 100644 --- a/code/datums/supplypacks/munitions_vr.dm +++ b/code/datums/supplypacks/munitions_vr.dm @@ -1,29 +1,25 @@ -/* -/datum/supply_pack/munitions/expeditionguns - name = "Frontier phaser (station-locked) crate" +/datum/supply_pack/munitions/expeditionguns //CHOMP Edit begin: Re-appropriating this whole block. Changing frontier phasers to phaseguns. + name = "Exploration phasegun (station-locked) crate" contains = list( - /obj/item/weapon/gun/energy/locked/frontier = 2, - /obj/item/weapon/gun/energy/locked/frontier/holdout = 2, + /obj/item/weapon/gun/energy/locked/phasegun/pistol = 2, + /obj/item/weapon/gun/energy/locked/phasegun/rifle = 2, + /obj/item/weapon/gun/energy/locked/phasegun = 2 ) cost = 35 containertype = /obj/structure/closet/crate/secure - containername = "frontier phaser crate" + containername = "phasegun crate" access = access_explorer -/datum/supply_pack/munitions/expeditionbows - name = "Frontier bows (station-locked) crate" +/datum/supply_pack/munitions/expeditioncannon + name = "Exploration phasecannon (station-locked) crate" contains = list( - /obj/item/weapon/gun/energy/locked/frontier/handbow=2 + /obj/item/weapon/gun/energy/locked/phasegun/cannon = 1 ) - cost = 20 + cost = 50 containertype = /obj/structure/closet/crate/secure - containername = "phaser handbow crate" -<<<<<<< HEAD - access = access_explorer -======= - access = access_security -*/ ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes + containername = "phasegun cannon crate" + access = access_explorer +//CHOMP Edit end /datum/supply_pack/munitions/ofd_charge_emp name = "OFD Charge - EMP" From 87d276be68d61a3a3f266989e4571a254b4e5e70 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 24 Jan 2023 17:18:19 -0700 Subject: [PATCH 05/10] no --- code/datums/supplypacks/supply.dm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 27428ab0f9..295a8e9580 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -178,13 +178,8 @@ ) cost=25 containertype = /obj/structure/closet/crate/secure/xion -<<<<<<< HEAD - containername = "Explorer equipment" - access = access_explorer -======= - containername = "Away Team equipment" - access = list(access_eva, access_explorer) ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes + containername = "Explorer equipment" //CHOMP explo keep + access = access_explorer //CHOMP explo keep /datum/supply_pack/pilotgear name= "Pilot gear" From 47605086f103196d83034715cf8a98538ec1dff0 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 24 Jan 2023 17:18:37 -0700 Subject: [PATCH 06/10] no --- code/datums/supplypacks/voidsuits_vr.dm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm index 37ccf6d197..7144597f89 100644 --- a/code/datums/supplypacks/voidsuits_vr.dm +++ b/code/datums/supplypacks/voidsuits_vr.dm @@ -9,13 +9,8 @@ ) cost = 45 containertype = /obj/structure/closet/crate/secure -<<<<<<< HEAD - containername = "Exploration voidsuit crate" - access = access_explorer -======= - containername = "Away Team voidsuit crate" - access = list(access_eva, access_explorer) ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes + containername = "Exploration voidsuit crate" //CHOMP explo keep + access = access_explorer //CHOMP explo keep /datum/supply_pack/voidsuits/explorer_medic name = "Expedition Medic voidsuits" @@ -154,4 +149,4 @@ name = "Solgov captain voidsuit crate" access = access_captain -// CHOMPStation EDIT End \ No newline at end of file +// CHOMPStation EDIT End From b7a52881ac2f86cd2e62bd4acea6140aace897bd Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 24 Jan 2023 17:19:09 -0700 Subject: [PATCH 07/10] no --- code/datums/supplypacks/voidsuits_vr.dm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm index 7144597f89..4c5e0278bf 100644 --- a/code/datums/supplypacks/voidsuits_vr.dm +++ b/code/datums/supplypacks/voidsuits_vr.dm @@ -105,19 +105,11 @@ ) cost = 150 containertype = /obj/structure/closet/crate/secure -<<<<<<< HEAD - name = "Solgov exploration voidsuit crate" - access = access_explorer + name = "Solgov exploration voidsuit crate" //CHOMP explo keep + access = access_explorer //CHOMP explo keep -/datum/supply_pack/voidsuits/solgov_engineer - name = "Solgov engineering voidsuit" -======= - name = "Commonwealth exploration voidsuit crate" - access = list(access_eva, access_explorer) - -/datum/supply_pack/voidsuits/com_engineer - name = "Commonwealth engineering voidsuit" ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes +/datum/supply_pack/voidsuits/solgov_engineer //CHOMP explo keep + name = "Solgov engineering voidsuit" //CHOMP explo keep contains = list( /obj/item/clothing/suit/space/void/engineering/alt2, /obj/item/clothing/head/helmet/space/void/engineering/alt2 From 3117fb30cf61d62bf5f8417ec941400e48332f84 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 24 Jan 2023 17:19:44 -0700 Subject: [PATCH 08/10] no --- code/game/jobs/access_datum_vr.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/jobs/access_datum_vr.dm b/code/game/jobs/access_datum_vr.dm index 4fe3d0b169..1f3a9f4b20 100644 --- a/code/game/jobs/access_datum_vr.dm +++ b/code/game/jobs/access_datum_vr.dm @@ -2,11 +2,7 @@ var/const/access_explorer = 43 /datum/access/explorer id = access_explorer -<<<<<<< HEAD - desc = "Explorer" -======= - desc = "Away Team" ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes + desc = "Explorer" //CHOMP explo keep region = ACCESS_REGION_GENERAL /var/const/access_pathfinder = 44 From 2fb984e33bf66729da48db646b65af32ff4f140b Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 24 Jan 2023 17:19:56 -0700 Subject: [PATCH 09/10] no --- code/game/objects/items/devices/radio/radio.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index e36372da6d..4810ea8375 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -14,11 +14,7 @@ var/global/list/default_internal_channels = list( num2text(SCI_FREQ) = list(access_tox, access_robotics, access_xenobiology), num2text(SUP_FREQ) = list(access_cargo, access_mining_station), num2text(SRV_FREQ) = list(access_janitor, access_library, access_hydroponics, access_bar, access_kitchen), -<<<<<<< HEAD - num2text(EXP_FREQ) = list(access_explorer, access_pilot) -======= - num2text(EXP_FREQ) = list(access_explorer) //VOREStation Edit ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes + num2text(EXP_FREQ) = list(access_explorer, access_pilot) //CHOMP explo keep ) var/global/list/default_medbay_channels = list( From cdf005afd99c6ab7e89c1c9f5cc1b65852ea4abd Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 24 Jan 2023 17:20:47 -0700 Subject: [PATCH 10/10] no --- .../structures/crates_lockers/closets/misc_vr.dm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 8dd56c7147..dd5d07c94d 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -51,11 +51,7 @@ * Explorer */ /obj/structure/closet/secure_closet/explorer -<<<<<<< HEAD - name = "explorer locker" -======= - name = "away team locker" ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes + name = "explorer locker" //CHOMP explo keep req_access = list(access_explorer) closet_appearance = /decl/closet_appearance/secure_closet/expedition/explorer @@ -97,11 +93,7 @@ */ /obj/structure/closet/secure_closet/pathfinder name = "pathfinder locker" -<<<<<<< HEAD - req_access = list(access_pathfinder) -======= - req_access = list(access_explorer) ->>>>>>> 7dec3dbaeb... Merge pull request #14234 from Novacat/nova-basicfixes + req_access = list(access_pathfinder) //CHOMP explo keep closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder starts_with = list(