From 446a26ada934d91616de30115d52d1a2e4225fa7 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri, 2 Apr 2021 13:21:44 +0100 Subject: [PATCH 1/4] Allows anchoring of fueltanks/watertanks/etc --- code/modules/reagents/reagent_dispenser.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 7e376b0ebaa..bb59339b7b3 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -3,8 +3,8 @@ desc = "..." icon = 'icons/obj/objects.dmi' icon_state = "watertank" - density = 1 - anchored = 0 + density = TRUE + anchored = TRUE pressure_resistance = 2*ONE_ATMOSPHERE container_type = DRAINABLE | AMOUNT_VISIBLE max_integrity = 300 @@ -28,6 +28,12 @@ create_reagents(tank_volume) reagents.add_reagent(reagent_id, tank_volume) +/obj/structure/reagent_dispensers/wrench_act(mob/user, obj/item/I) + . = TRUE + if(!I.tool_use_check(user, 0)) + return + default_unfasten_wrench(user, I) + /obj/structure/reagent_dispensers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() if(reagents) @@ -234,12 +240,6 @@ user.put_in_hands(S) paper_cups-- -/obj/structure/reagent_dispensers/water_cooler/wrench_act(mob/user, obj/item/I) - . = TRUE - if(!I.tool_use_check(user, 0)) - return - default_unfasten_wrench(user, I, 40) - /obj/structure/reagent_dispensers/beerkeg name = "beer keg" desc = "Beer is liquid bread, it's good for you..." From c89089a06313efe700542ab5121dc89d7c17ef6d Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri, 2 Apr 2021 13:43:28 +0100 Subject: [PATCH 2/4] Examine text + Walltank support --- code/modules/reagents/reagent_dispenser.dm | 37 ++++++++++++++-------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index bb59339b7b3..f4da7a66589 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -8,9 +8,14 @@ pressure_resistance = 2*ONE_ATMOSPHERE container_type = DRAINABLE | AMOUNT_VISIBLE max_integrity = 300 - var/tank_volume = 1000 //In units, how much the dispenser can hold - var/reagent_id = "water" //The ID of the reagent that the dispenser uses - var/lastrigger = "" // The last person to rig this fuel tank - Stored with the object. Only the last person matter for investigation + /// How much this dispenser can hold (In units) + var/tank_volume = 1000 + /// The ID of the reagent that the dispenser uses + var/reagent_id = "water" + /// The last person to rig this fuel tank - Stored with the object. Only the last person matter for investigation + var/lastrigger = "" + /// Can this tank be unwrenched + var/can_be_unwrenched = TRUE /obj/structure/reagent_dispensers/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -29,11 +34,18 @@ reagents.add_reagent(reagent_id, tank_volume) /obj/structure/reagent_dispensers/wrench_act(mob/user, obj/item/I) + if(!can_be_unwrenched) + return . = TRUE if(!I.tool_use_check(user, 0)) return default_unfasten_wrench(user, I) +/obj/structure/reagent_dispensers/examine(mob/user) + . = ..() + if(can_be_unwrenched) + . += "You can [anchored ? "unlock the wheels" : "lock it in place"] with a Wrench" + /obj/structure/reagent_dispensers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() if(reagents) @@ -212,8 +224,8 @@ name = "pepper spray refiller" desc = "Contains condensed capsaicin for use in law \"enforcement.\"" icon_state = "pepper" - anchored = 1 - density = 0 + density = FALSE + can_be_unwrenched = FALSE reagent_id = "condensedcapsaicin" /obj/structure/reagent_dispensers/water_cooler @@ -221,7 +233,6 @@ desc = "A machine that dispenses liquid to drink." icon = 'icons/obj/vending.dmi' icon_state = "water_cooler" - anchored = 1 tank_volume = 500 reagent_id = "water" var/paper_cups = 25 //Paper cups left from the cooler @@ -263,22 +274,22 @@ name = "virus food dispenser" desc = "A dispenser of low-potency virus mutagenic." icon_state = "virus_food" - anchored = 1 - density = 0 + can_be_unwrenched = FALSE + density = FALSE reagent_id = "virusfood" /obj/structure/reagent_dispensers/spacecleanertank name = "space cleaner refiller" desc = "Refills space cleaner bottles." icon_state = "cleaner" - anchored = 1 - density = 0 + can_be_unwrenched = FALSE + density = FALSE tank_volume = 5000 reagent_id = "cleaner" /obj/structure/reagent_dispensers/fueltank/chem icon_state = "fuel_chem" - anchored = 1 - density = 0 - accepts_rig = 0 + can_be_unwrenched = FALSE + density = FALSE + accepts_rig = FALSE tank_volume = 1000 From 7755b4f4b48ee0df67a10552eb80ee893f59ff77 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri, 2 Apr 2021 13:54:24 +0100 Subject: [PATCH 3/4] Update code/modules/reagents/reagent_dispenser.dm Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com> --- code/modules/reagents/reagent_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index f4da7a66589..fe7d34053e1 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -12,7 +12,7 @@ var/tank_volume = 1000 /// The ID of the reagent that the dispenser uses var/reagent_id = "water" - /// The last person to rig this fuel tank - Stored with the object. Only the last person matter for investigation + /// The last person to rig this fuel tank - Stored with the object. Only the last person matters for investigation var/lastrigger = "" /// Can this tank be unwrenched var/can_be_unwrenched = TRUE From 02c91122c3756bd93179f55c574d42555e680b74 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon, 5 Apr 2021 17:29:02 +0100 Subject: [PATCH 4/4] Message tweak --- code/modules/reagents/reagent_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index fe7d34053e1..c58cb676cc0 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -44,7 +44,7 @@ /obj/structure/reagent_dispensers/examine(mob/user) . = ..() if(can_be_unwrenched) - . += "You can [anchored ? "unlock the wheels" : "lock it in place"] with a Wrench" + . += "The wheels look like they can be [anchored ? "unlocked" : "locked in place"] with a wrench." /obj/structure/reagent_dispensers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..()