mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 00:29:02 +01:00
Oldstation (Charlie) experiments tweaks [NO GBP] (#84379)
## About The Pull Request There was a feedback that the new techweb made it harder to do science on ghost roles, namely Charlie station crew. This PR makes a few tweaks to oldstation to lower the bar on the experiments: - Added a pure N2O tank for easier BZ creation - Added one diamond to the ai sat to create artificial BS crystal - Added research console to ai sat with frontier app pre-installed - Added a gas compressor to Beta station atmos area Also moved the NTNet relay back to tcomms node as it requires tcomms parts. And moved chem pack/blood pack from tier 1 to tier 0 per players` request. Also fixed the dissection experiments giving the old amount of bonus points, before the recent point denomination. Made a few other minor changes to the map. ## Why It's Good For The Game Charlie is supposed to be friendly for the beginner players, yet the new experiments are hard to do with the limited resources on Charlie. ## Changelog 🆑 qol: It is easier to do some required techweb experiments on Charlie station now fix: Fixed experimental dissection surgeries giving too many points balance: Techweb: Moved NTNet relay back to tcomms node balance: Techweb: Moved blood pack and chem pack to the starting node /🆑
This commit is contained in:
@@ -70,6 +70,7 @@
|
||||
/obj/item/stack/sheet/plasteel{
|
||||
amount = 30
|
||||
},
|
||||
/obj/item/stack/sheet/mineral/diamond,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/ruin/space/ancientstation/delta/ai)
|
||||
"as" = (
|
||||
@@ -226,7 +227,7 @@
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/charlie/bridge)
|
||||
"bh" = (
|
||||
/obj/machinery/computer/old{
|
||||
/obj/machinery/modular_computer/preset/research/away{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced/spawner/directional/south,
|
||||
@@ -793,6 +794,15 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/charlie/hydro)
|
||||
"ds" = (
|
||||
/obj/structure/window/reinforced/spawner/directional/west,
|
||||
/obj/structure/window/reinforced/spawner/directional/north,
|
||||
/obj/structure/window/reinforced/spawner/directional/south,
|
||||
/obj/structure/table,
|
||||
/obj/machinery/door/window/brigdoor/right/directional/east,
|
||||
/obj/item/computer_disk,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/ruin/space/ancientstation/delta/ai)
|
||||
"dt" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -961,8 +971,11 @@
|
||||
/area/ruin/space/ancientstation/charlie/bridge)
|
||||
"ek" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/reagent_dispensers/fueltank,
|
||||
/obj/effect/turf_decal/tile/yellow/half/contrasted,
|
||||
/obj/structure/closet/crate/bin,
|
||||
/obj/effect/spawner/random/trash/garbage,
|
||||
/obj/effect/spawner/random/trash/garbage,
|
||||
/obj/effect/spawner/random/trash/garbage,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/charlie/engie)
|
||||
"el" = (
|
||||
@@ -1088,6 +1101,10 @@
|
||||
/obj/effect/turf_decal/tile/yellow/half/contrasted{
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/chair{
|
||||
pixel_y = -8;
|
||||
pixel_x = 13
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/charlie/engie)
|
||||
"eL" = (
|
||||
@@ -1527,7 +1544,6 @@
|
||||
"gM" = (
|
||||
/obj/machinery/rnd/production/circuit_imprinter/offstation,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/reagent_containers/dropper,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/ruin/space/ancientstation/delta/rnd)
|
||||
"gP" = (
|
||||
@@ -1911,6 +1927,7 @@
|
||||
/obj/item/folder/white,
|
||||
/obj/item/reagent_containers/cup/beaker,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/reagent_containers/dropper,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/delta/rnd)
|
||||
"ip" = (
|
||||
@@ -2252,9 +2269,8 @@
|
||||
"jP" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/storage/backpack/duffelbag,
|
||||
/obj/structure/closet,
|
||||
/obj/effect/spawner/random/clothing/backpack,
|
||||
/obj/item/storage/backpack/duffelbag/sec,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/charlie/dorms)
|
||||
"jU" = (
|
||||
@@ -2673,13 +2689,10 @@
|
||||
/area/ruin/space/ancientstation/charlie/kitchen)
|
||||
"lz" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/closet/crate/bin,
|
||||
/obj/effect/turf_decal/tile/yellow/half/contrasted{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/spawner/random/trash/garbage,
|
||||
/obj/effect/spawner/random/trash/garbage,
|
||||
/obj/effect/spawner/random/trash/garbage,
|
||||
/obj/machinery/computer/apc_control/away,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/charlie/engie)
|
||||
"lB" = (
|
||||
@@ -2899,9 +2912,9 @@
|
||||
"mz" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/storage/backpack/old,
|
||||
/obj/structure/closet,
|
||||
/obj/effect/spawner/random/clothing/backpack,
|
||||
/obj/item/storage/backpack/industrial,
|
||||
/obj/item/storage/backpack/messenger/eng,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/charlie/dorms)
|
||||
"mA" = (
|
||||
@@ -2939,7 +2952,7 @@
|
||||
/obj/machinery/shower/directional/west{
|
||||
has_water_reclaimer = 0
|
||||
},
|
||||
/turf/open/floor/vault,
|
||||
/turf/open/floor/pod/dark,
|
||||
/area/ruin/space/ancientstation/delta/biolab)
|
||||
"mG" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -3116,16 +3129,30 @@
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/beta/hall)
|
||||
"ng" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/pipedispenser/disposal/transit_tube,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/fluff/broken_canister_frame,
|
||||
/obj/effect/decal/cleanable/plasma,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/beta/atmos)
|
||||
"nk" = (
|
||||
/turf/closed/wall,
|
||||
/area/ruin/space/ancientstation/charlie/dorms)
|
||||
"nm" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
|
||||
/obj/effect/turf_decal/tile/yellow/half/contrasted{
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/tank/internals/oxygen{
|
||||
pixel_x = 1
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/beta/atmos)
|
||||
"np" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/light/directional/north,
|
||||
@@ -3193,6 +3220,7 @@
|
||||
/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/tank/internals/anesthetic/pure,
|
||||
/turf/open/floor/iron/airless,
|
||||
/area/ruin/space/ancientstation/beta/medbay)
|
||||
"nD" = (
|
||||
@@ -3404,6 +3432,11 @@
|
||||
/obj/effect/decal/cleanable/xenoblood/xgibs/core,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/ruin/space/ancientstation/delta/rnd)
|
||||
"oK" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/pipedispenser,
|
||||
/turf/open/floor/iron/airless,
|
||||
/area/ruin/space/ancientstation/beta/hall)
|
||||
"oL" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -3622,7 +3655,6 @@
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/beta/mining)
|
||||
"qk" = (
|
||||
/obj/machinery/pipedispenser,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
@@ -3866,6 +3898,7 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/window/reinforced/spawner/directional/east,
|
||||
/obj/effect/turf_decal/tile/yellow/half/contrasted,
|
||||
/obj/structure/reagent_dispensers/fueltank,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/charlie/engie)
|
||||
"si" = (
|
||||
@@ -4413,7 +4446,7 @@
|
||||
/obj/structure/closet/crate/secure/weapon{
|
||||
req_access = list("away_sec")
|
||||
},
|
||||
/obj/item/knife/combat,
|
||||
/obj/item/spess_knife,
|
||||
/obj/item/clothing/suit/armor/vest/old,
|
||||
/obj/item/gun/ballistic/rifle/boltaction,
|
||||
/obj/item/ammo_box/strilka310,
|
||||
@@ -5369,6 +5402,14 @@
|
||||
/obj/effect/mapping_helpers/broken_floor,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin/space/ancientstation/beta/supermatter)
|
||||
"DA" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/closet,
|
||||
/obj/item/storage/backpack/science,
|
||||
/obj/item/storage/backpack/messenger/science,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/charlie/dorms)
|
||||
"DB" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/decal/cleanable/cobweb,
|
||||
@@ -5383,6 +5424,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/light/small/directional/south,
|
||||
/obj/machinery/atmospherics/components/binary/tank_compressor,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/beta/atmos)
|
||||
"DI" = (
|
||||
@@ -5715,9 +5757,9 @@
|
||||
/area/ruin/space/ancientstation/charlie/hall)
|
||||
"Gb" = (
|
||||
/obj/effect/decal/cleanable/glass,
|
||||
/obj/item/stack/rods,
|
||||
/obj/effect/mapping_helpers/broken_floor,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/structure/tank_dispenser/plasma,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/beta/atmos)
|
||||
"Gd" = (
|
||||
@@ -5801,10 +5843,13 @@
|
||||
/turf/open/floor/iron/cafeteria,
|
||||
/area/ruin/space/ancientstation/charlie/kitchen)
|
||||
"GP" = (
|
||||
/obj/machinery/pipedispenser/disposal,
|
||||
/obj/effect/turf_decal/stripes/corner{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/beta/atmos)
|
||||
"GX" = (
|
||||
@@ -8189,6 +8234,14 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/item/tank/internals/oxygen{
|
||||
pixel_y = -8;
|
||||
pixel_x = 8
|
||||
},
|
||||
/obj/item/tank/internals/oxygen{
|
||||
pixel_x = -4;
|
||||
pixel_y = 4
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/ruin/space/ancientstation/beta/atmos)
|
||||
"XD" = (
|
||||
@@ -9955,7 +10008,7 @@ Uu
|
||||
Yp
|
||||
Gb
|
||||
XB
|
||||
Ln
|
||||
nm
|
||||
kK
|
||||
Ln
|
||||
ny
|
||||
@@ -10151,7 +10204,7 @@ gJ
|
||||
Ax
|
||||
Ax
|
||||
kQ
|
||||
Cj
|
||||
oK
|
||||
Sf
|
||||
Cj
|
||||
VF
|
||||
@@ -12201,7 +12254,7 @@ wb
|
||||
bR
|
||||
aG
|
||||
nk
|
||||
mz
|
||||
DA
|
||||
gZ
|
||||
kN
|
||||
Mt
|
||||
@@ -14219,7 +14272,7 @@ ag
|
||||
aM
|
||||
NS
|
||||
bh
|
||||
cz
|
||||
ds
|
||||
cz
|
||||
cz
|
||||
ad
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
/// Trim for the oldstation ruin/Charlie station to access APCs and other equipment
|
||||
/datum/id_trim/away/old/equipment
|
||||
access = list(ACCESS_AWAY_GENERAL, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP)
|
||||
access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_ENGINEERING, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP)
|
||||
assignment = "Engine Equipment Access"
|
||||
|
||||
/// Trim for the oldstation ruin/Charlie station to access robots, and downloading of paper publishing software for experiments
|
||||
|
||||
@@ -205,3 +205,6 @@
|
||||
. = ..()
|
||||
if(active_apc)
|
||||
disconnect_apc()
|
||||
|
||||
/obj/machinery/computer/apc_control/away
|
||||
req_access = list(ACCESS_AWAY_ENGINEERING)
|
||||
|
||||
@@ -32,10 +32,6 @@
|
||||
* Backpack Types
|
||||
*/
|
||||
|
||||
/obj/item/storage/backpack/old/Initialize(mapload)
|
||||
. = ..()
|
||||
atom_storage.max_total_storage = 12
|
||||
|
||||
/obj/item/bag_of_holding_inert
|
||||
name = "inert bag of holding"
|
||||
desc = "What is currently a just an unwieldly block of metal with a slot ready to accept a bluespace anomaly core."
|
||||
|
||||
@@ -77,6 +77,14 @@
|
||||
. += span_notice("A warning is etched into [src]...")
|
||||
. += span_warning("There is no process in the body that uses N2O, so patients will exhale the N2O... exposing you to it. Make sure to work in a well-ventilated space to avoid sleepy mishaps.")
|
||||
|
||||
/obj/item/tank/internals/anesthetic/pure
|
||||
desc = "A tank with pure N2O. There is a warning sticker crudely slapped onto the tank."
|
||||
icon_state = "anesthetic_warning"
|
||||
|
||||
/obj/item/tank/internals/anesthetic/pure/populate_gas()
|
||||
air_contents.assert_gases(/datum/gas/nitrous_oxide)
|
||||
air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
|
||||
|
||||
/*
|
||||
* Plasma
|
||||
*/
|
||||
|
||||
@@ -33,6 +33,17 @@
|
||||
/datum/computer_file/program/scipaper_program,
|
||||
)
|
||||
|
||||
/obj/machinery/modular_computer/preset/research/away
|
||||
name = "old research console"
|
||||
desc = "An old computer used for writing research papers."
|
||||
starting_programs = list(
|
||||
/datum/computer_file/program/scipaper_program,
|
||||
)
|
||||
|
||||
/obj/machinery/modular_computer/preset/research/away/Initialize(mapload)
|
||||
. = ..()
|
||||
cpu.device_theme = PDA_THEME_RETRO
|
||||
|
||||
// ===== COMMAND CONSOLE =====
|
||||
/obj/machinery/modular_computer/preset/command
|
||||
name = "command console"
|
||||
|
||||
@@ -68,6 +68,7 @@
|
||||
"HFR_interface",
|
||||
"HFR_moderator_input",
|
||||
"HFR_waste_output",
|
||||
"adv_fire_extinguisher",
|
||||
"bolter_wrench",
|
||||
"rpd_loaded",
|
||||
"engine_goggles",
|
||||
@@ -92,14 +93,13 @@
|
||||
"rcd_ammo",
|
||||
"weldingmask",
|
||||
"magboots",
|
||||
"adv_fire_extinguisher",
|
||||
)
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
|
||||
discount_experiments = list(/datum/experiment/ordnance/gaseous/noblium = TECHWEB_TIER_4_POINTS)
|
||||
|
||||
/datum/techweb_node/rcd_upgrade
|
||||
id = TECHWEB_NODE_RCD_UPGRADE
|
||||
display_name = "Rapid Device Upgrade Designs"
|
||||
display_name = "Rapid Construction Device Upgrades"
|
||||
description = "New designs and enhancements for RCD and RPD."
|
||||
prereq_ids = list(TECHWEB_NODE_EXP_TOOLS, TECHWEB_NODE_PARTS_BLUESPACE)
|
||||
design_ids = list(
|
||||
|
||||
@@ -88,6 +88,7 @@
|
||||
"comm_monitor",
|
||||
"comm_server",
|
||||
"message_monitor",
|
||||
"ntnet_relay",
|
||||
"s_hub",
|
||||
"s_messaging",
|
||||
"s_server",
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
"stethoscope",
|
||||
"beaker",
|
||||
"large_beaker",
|
||||
"chem_pack",
|
||||
"blood_pack",
|
||||
"syringe",
|
||||
"dropper",
|
||||
"pillbottle",
|
||||
@@ -40,8 +42,6 @@
|
||||
prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP)
|
||||
design_ids = list(
|
||||
"xlarge_beaker",
|
||||
"blood_pack",
|
||||
"chem_pack",
|
||||
"med_spray_bottle",
|
||||
"medigel",
|
||||
"medipen_refiller",
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
"destructive_analyzer",
|
||||
"destructive_scanner",
|
||||
"experi_scanner",
|
||||
"ntnet_relay",
|
||||
"laptop",
|
||||
"portadrive_basic",
|
||||
"portadrive_advanced",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
///How many research points you gain from dissecting a Human.
|
||||
#define BASE_HUMAN_REWARD 500
|
||||
#define BASE_HUMAN_REWARD 10
|
||||
|
||||
/datum/surgery/advanced/experimental_dissection
|
||||
name = "Experimental Dissection"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 109 KiB After Width: | Height: | Size: 122 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 16 KiB |
Reference in New Issue
Block a user