Skip to content

Chemical Dispenser Mk .5 #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ossa88 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Chemical Dispenser Mk .5 #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ff4181
Initial
Ossa88 Apr 9, 2026
b3c6b89
prettier gods
Ossa88 Apr 9, 2026
d735dc0
converting these particular ruins/ships to use new jug based
Ossa88 Apr 9, 2026
e11cb8e
makes it easier to get, and removes some of the old system....
Ossa88 Apr 9, 2026
5c60473
fix: update supply pack item lists to use 'contains' instead of 'items'
Ossa88 Apr 9, 2026
fc0cca3
Merge branch 'master' into chemdisp
Ossa88 Apr 10, 2026
0806953
Clear default chemicals in jug-based chem dispenser initialization an…
Ossa88 May 28, 2026
f2222d9
Adds safety checks and functionality to return specific amounts of ch…
Ossa88 Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/PentestMaps/JungleRuins/jungle_medtech_outbreak.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2056,7 +2056,7 @@
dir = 4
},
/obj/structure/window/reinforced/spawner,
/obj/machinery/chem_dispenser,
/obj/machinery/chem_dispenser/jug_based,
/turf/open/floor/plasteel/tech,
/area/ship/science)
"HW" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/PentestMaps/SandRuins/whitesands_surface_medipen_plant.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"iq" = (
/obj/machinery/chem_dispenser,
/obj/machinery/chem_dispenser/jug_based,
/obj/effect/turf_decal/industrial/warning{
dir = 8
},
Expand Down Expand Up @@ -640,7 +640,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/powered)
"qI" = (
/obj/machinery/chem_dispenser,
/obj/machinery/chem_dispenser/jug_based,
/obj/effect/turf_decal/industrial/warning{
dir = 4
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_cheyenne.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"dN" = (
/obj/machinery/chem_dispenser,
/obj/machinery/chem_dispenser/jug_based,
/obj/effect/turf_decal/corner/opaque/ntblue/border{
dir = 4
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/PentestMaps/SpaceRuins/oretruck.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,7 +1171,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/syringe/contraband/methamphetamine,
/obj/machinery/chem_dispenser,
/obj/machinery/chem_dispenser/jug_based,
/turf/open/floor/plating,
/area/ruin/space/has_grav/radship/MethLab)
"Fq" = (
Expand Down
58 changes: 58 additions & 0 deletions modular_pentest/modules/chemistry/code/circuitboards/machine_circuitboards.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// PENTEST ADDITION - JUG-BASED CHEM DISPENSER CIRCUITBOARD

/obj/item/circuitboard/machine/chem_dispenser/jug_based
name = "Chem Dispenser (Machine Board)"
icon_state = "medical"
build_path = /obj/machinery/chem_dispenser/jug_based
req_components = list(
/obj/item/stock_parts/matter_bin = 2,
/obj/item/stock_parts/capacitor = 1,
/obj/item/stock_parts/manipulator = 1,
/obj/item/stack/sheet/glass = 1,
/obj/item/stock_parts/cell = 1)
def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high)
needs_anchored = FALSE

// Random Spawner Edits

/obj/effect/spawner/random/techstorage/medical
loot = list(
/obj/item/circuitboard/machine/chem_dispenser/jug_based,
/obj/item/circuitboard/computer/scan_consolenew,
/obj/item/circuitboard/computer/med_data,
/obj/item/circuitboard/machine/smoke_machine,
/obj/item/circuitboard/machine/chem_master,
/obj/item/circuitboard/machine/dnascanner,
/obj/item/circuitboard/computer/pandemic
)

/obj/effect/spawner/random/circuit/machine/rare
loot = list(
/obj/item/circuitboard/aicore = 5,
/obj/item/circuitboard/machine/chem_dispenser/jug_based = 5,
/obj/item/circuitboard/machine/rad_collector = 5,
/obj/item/circuitboard/machine/launchpad = 5,
/obj/item/circuitboard/machine/shuttle/engine/electric = 5,
/obj/item/circuitboard/machine/shuttle/smes = 5,
)

// Research Design Edits

/datum/design/board/chem_dispenser
build_path = /obj/item/circuitboard/machine/chem_dispenser/jug_based

// Cargo Edits

/datum/supply_pack/medical/chem_dispenser
name = "Chemical Dispenser Supply Crate"
desc = "A supply crate containing a chemical dispenser and its necessary components. Useful for stocking medical storage closets or cargo shipments."
cost = 1000
contains = list(/obj/item/circuitboard/machine/chem_dispenser/jug_based)
crate_name = "chemical dispenser crate"

/datum/supply_pack/medical/chem_master
name = "Chem Master Supply Crate"
desc = "A supply crate containing a chem master and its necessary components. Useful for stocking medical storage closets or cargo shipments."
cost = 1500
contains = list(/obj/item/circuitboard/machine/chem_master)
crate_name = "chem master crate"
Loading
Loading