Merge pull request #15811 from AffectedArc07/reagent-container-anchoring

Allows anchoring of fueltanks/watertanks/etc
This commit is contained in:
Fox McCloud
2021-05-15 11:05:22 -04:00
committed by GitHub
+32 -21
View File
@@ -3,14 +3,19 @@
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
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 matters 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)
. = ..()
@@ -28,6 +33,19 @@
create_reagents(tank_volume)
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)
. += "<span class='notice'>The wheels look like they can be <b>[anchored ? "unlocked" : "locked in place"]</b> with a <b>wrench</b>."
/obj/structure/reagent_dispensers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..()
if(reagents)
@@ -206,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
@@ -215,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
@@ -234,12 +251,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..."
@@ -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