Merge pull request #5446 from CHOMPStation2/upstream-merge-14234

[MIRROR] Fixes some Oversights
This commit is contained in:
Razgriz
2023-01-24 17:34:45 -07:00
committed by GitHub
9 changed files with 114 additions and 44649 deletions
+1 -1
View File
@@ -178,7 +178,7 @@
)
cost=25
containertype = /obj/structure/closet/crate/secure/xion
containername = "Explore equipment" //CHOMP explo keep
containername = "Explorer equipment" //CHOMP explo keep
access = access_explorer //CHOMP explo keep
/datum/supply_pack/pilotgear
+5 -5
View File
@@ -105,11 +105,11 @@
)
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Solgov exploration voidsuit crate" //CHOMP explo keep
name = "Solgov exploration voidsuit crate" //CHOMP explo keep
access = access_explorer //CHOMP explo keep
/datum/supply_pack/voidsuits/solgov_engineer
name = "Solgov engineering voidsuit"
/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
@@ -140,5 +140,5 @@
containertype = /obj/structure/closet/crate/secure
name = "Solgov captain voidsuit crate"
access = access_captain
// CHOMPStation EDIT End
+1 -1
View File
@@ -1 +1 @@
lol byeeeeeeeeeeeee
eeeeeeee
+1 -97
View File
@@ -1,97 +1 @@
// ### Preset machines ###
// #### Relays ####
// Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels.
/obj/machinery/telecomms/relay/preset/station
id = "groundbase Relay"
autolinkers = list("groundbase_relay")
// #### Hub ####
/obj/machinery/telecomms/hub/preset/groundbase
id = "Hub"
network = "tcommsat"
autolinkers = list("hub",
"groundbase_relay", "c_relay", "m_relay", "r_relay",
"science", "medical", "supply", "service", "common", "command", "engineering", "security", "Away Team", "unused",
"hb_relay", "receiverA", "broadcasterA"
)
/obj/machinery/telecomms/receiver/preset_right/groundbase
id = "groundbase_rx"
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ)
/obj/machinery/telecomms/broadcaster/preset_right/groundbase
id = "groundbase_tx"
/obj/machinery/telecomms/bus/preset_two/groundbase
freq_listening = list(SUP_FREQ, SRV_FREQ, EXP_FREQ)
/obj/machinery/telecomms/server/presets/service/groundbase
freq_listening = list(SRV_FREQ, EXP_FREQ)
autolinkers = list("service", "Away Team")
// Telecommunications Satellite
/area/groundbase/command/tcomms
name = "\improper Telecomms"
ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg')
/area/groundbase/command/tcomms/entrance
name = "\improper Telecomms Teleporter"
/area/groundbase/command/tcomms/foyer
name = "\improper Telecomms Foyer"
/area/groundbase/command/tcomms/storage
name = "\improper Telecomms Storage"
/area/groundbase/command/tcomms/computer
name = "\improper Telecomms Control Room"
/area/groundbase/command/tcomms/chamber
name = "\improper Telecomms Central Compartment"
flags = BLUE_SHIELDED
/area/maintenance/substation/tcomms
name = "\improper Telecomms Substation"
/area/maintenance/station/tcomms
name = "\improper Telecoms Maintenance"
/datum/map/groundbase/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ENT_FREQ) = list(),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ)= list(access_heads),
num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ)=list(access_medical_equip),
num2text(SEC_FREQ) = list(access_security),
num2text(SEC_I_FREQ)=list(access_security),
num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
num2text(SUP_FREQ) = list(access_cargo),
num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
num2text(EXP_FREQ) = list(access_awayteam)
)
/obj/item/device/multitool/groundbase_buffered
name = "pre-linked multitool (Rascal's Pass hub)"
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()
. = ..()
buffer = locate(/obj/machinery/telecomms/hub/preset/groundbase)
/obj/item/device/bluespaceradio/groundbase_prelinked
<<<<<<< HEAD
name = "bluespace radio (Stellar Delight)"
=======
name = "bluespace radio (Rascal's Pass)"
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
handset = /obj/item/device/radio/bluespacehandset/linked/groundbase_prelinked
/obj/item/device/radio/bluespacehandset/linked/groundbase_prelinked
bs_tx_preload_id = "groundbase_rx" //Transmit to a receiver
bs_rx_preload_id = "groundbase_tx" //Recveive from a transmitter
idgaf
+81 -114
View File
@@ -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
File diff suppressed because it is too large Load Diff
@@ -81,11 +81,11 @@
num2text(EXP_FREQ) = list(access_awayteam)
)
/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)
+20 -8
View File
@@ -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)
+2 -2
View File
@@ -81,10 +81,10 @@
num2text(EXP_FREQ) = list(access_awayteam)
)
/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)