Skip to content
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.

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

[MIRROR] General maintenance for reagent grinder #2625

Merged
merged 3 commits into from
Mar 28, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
[MIRROR] General maintenance for reagent grinder (#1642)
General maintenance for reagent grinder

Co-authored-by: SyncIt21 <[email protected]>
2 people authored and StealsThePRs committed Mar 28, 2024
commit 3086f4c862fc68d3a10da00479580d48f67bc17f
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/nova/port_tarkon.dmm
Original file line number Diff line number Diff line change
@@ -4396,7 +4396,7 @@
/area/ruin/space/has_grav/port_tarkon/secoff)
"DG" = (
/obj/structure/table/reinforced,
/obj/machinery/reagentgrinder/constructed,
/obj/machinery/reagentgrinder,
/obj/machinery/light/small/directional/west,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/port_tarkon/kitchen)
@@ -7204,7 +7204,7 @@
dir = 1
},
/obj/structure/table/reinforced,
/obj/machinery/reagentgrinder/constructed,
/obj/machinery/reagentgrinder,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/port_tarkon/developement)
"Wy" = (
4 changes: 2 additions & 2 deletions _maps/shuttles/pirate_ex_interdyne.dmm
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@
dir = 8
},
/obj/structure/table/reinforced/plastitaniumglass,
/obj/machinery/reagentgrinder/constructed,
/obj/machinery/reagentgrinder,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"al" = (
@@ -625,7 +625,7 @@
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/plasma,
/obj/machinery/reagentgrinder/constructed,
/obj/machinery/reagentgrinder,
/obj/item/storage/box/monkeycubes/syndicate,
/obj/item/storage/box/monkeycubes/syndicate,
/obj/item/reagent_containers/cup/bottle,
3 changes: 0 additions & 3 deletions code/__DEFINES/traits/declarations.dm
Original file line number Diff line number Diff line change
@@ -803,9 +803,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_VENTCRAWLER_ALWAYS "ventcrawler_always"
#define TRAIT_VENTCRAWLER_NUDE "ventcrawler_nude"

/// Minor trait used for beakers, or beaker-ishes. [/obj/item/reagent_containers], to show that they've been used in a reagent grinder.
#define TRAIT_MAY_CONTAIN_BLENDED_DUST "may_contain_blended_dust"

/// Trait put on [/mob/living/carbon/human]. If that mob has a crystal core, also known as an ethereal heart, it will not try to revive them if the mob dies.
#define TRAIT_CANNOT_CRYSTALIZE "cannot_crystalize"

3 changes: 0 additions & 3 deletions code/_globalvars/traits/_traits.dm
Original file line number Diff line number Diff line change
@@ -582,9 +582,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
/obj/item/organ/internal/lungs = list(
"TRAIT_SPACEBREATHING" = TRAIT_SPACEBREATHING,
),
/obj/item/reagent_containers = list(
"TRAIT_MAY_CONTAIN_BLENDED_DUST" = TRAIT_MAY_CONTAIN_BLENDED_DUST,
),
/obj/machinery/modular_computer = list(
"TRAIT_MODPC_INTERACTING_WITH_FRAME" = TRAIT_MODPC_INTERACTING_WITH_FRAME,
),
Original file line number Diff line number Diff line change
@@ -525,9 +525,11 @@
/obj/item/circuitboard/machine/reagentgrinder
name = "All-In-One Grinder"
greyscale_colors = CIRCUIT_COLOR_GENERIC
build_path = /obj/machinery/reagentgrinder/constructed
build_path = /obj/machinery/reagentgrinder
req_components = list(
/datum/stock_part/servo = 1)
/datum/stock_part/servo = 1,
/datum/stock_part/matter_bin = 1,
)
needs_anchored = FALSE

/obj/item/circuitboard/machine/smartfridge
Loading