From 2c92a2a4ac0efe082a79109dd3deba356b9b15fd Mon Sep 17 00:00:00 2001 From: klaasjared <86997650+GhostActual@users.noreply.github.com> Date: Mon, 2 Aug 2021 18:53:36 -0400 Subject: [PATCH] Base Commit --- code/modules/mob/living/bot/farmbot.dm | 6 +- .../machinery/dispenser/reagent_tank.dm | 65 ++++++++++-------- icons/obj/chemical_tanks.dmi | Bin 0 -> 7341 bytes 3 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 icons/obj/chemical_tanks.dmi diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 01d9702aa81..0bb9ed463c8 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -6,7 +6,7 @@ /mob/living/bot/farmbot name = "Farmbot" desc = "The botanist's best friend." - icon = 'icons/obj/aibots.dmi' + icon = 'icons/obj/chemical_tanks.dmi' icon_state = "farmbot0" health = 50 maxHealth = 50 @@ -38,7 +38,7 @@ /mob/living/bot/farmbot/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() - + data["on"] = on data["tank"] = !!tank if(tank) @@ -105,7 +105,7 @@ else turn_on() . = TRUE - + if(locked) return TRUE switch(action) diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 42e59d0c98e..0ee92fedb27 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -1,8 +1,8 @@ /obj/structure/reagent_dispensers name = "Dispenser" desc = "..." - icon = 'icons/obj/objects.dmi' - icon_state = "watertank" + icon = 'icons/obj/chemical_tanks.dmi' + icon_state = "tank" layer = TABLE_LAYER density = TRUE anchored = FALSE @@ -76,14 +76,15 @@ /obj/structure/reagent_dispensers/blob_act() qdel(src) +/* + * Tanks + */ - -//Dispensers +//Water /obj/structure/reagent_dispensers/watertank - name = "watertank" - desc = "A watertank." - icon = 'icons/obj/objects_vr.dmi' //VOREStation Edit - icon_state = "watertank" + name = "water tank" + desc = "A water tank." + icon_state = "water" amount_per_transfer_from_this = 10 /obj/structure/reagent_dispensers/watertank/Initialize() @@ -93,17 +94,17 @@ /obj/structure/reagent_dispensers/watertank/high name = "high-capacity water tank" desc = "A highly-pressurized water tank made to hold vast amounts of water.." - icon_state = "watertank_high" + icon_state = "water_high" /obj/structure/reagent_dispensers/watertank/high/Initialize() . = ..() reagents.add_reagent("water", 4000) +//Fuel /obj/structure/reagent_dispensers/fueltank - name = "fueltank" - desc = "A fueltank." - icon = 'icons/obj/objects_vr.dmi' //VOREStation Edit - icon_state = "weldtank" + name = "fuel tank" + desc = "A fuel tank." + icon_state = "fuel" amount_per_transfer_from_this = 10 var/modded = 0 var/obj/item/device/assembly_holder/rig = null @@ -112,30 +113,45 @@ . = ..() reagents.add_reagent("fuel",1000) -//VOREStation Add /obj/structure/reagent_dispensers/fueltank/high name = "high-capacity fuel tank" desc = "A highly-pressurized fuel tank made to hold vast amounts of fuel." - icon_state = "weldtank_high" + icon_state = "fuel_high" /obj/structure/reagent_dispensers/fueltank/high/Initialize() . = ..() reagents.add_reagent("fuel",4000) +//Foam /obj/structure/reagent_dispensers/foam - name = "foamtank" + name = "foam tank" desc = "A foam tank." - icon = 'icons/obj/objects_vr.dmi' - icon_state = "foamtank" + icon_state = "foam" amount_per_transfer_from_this = 10 /obj/structure/reagent_dispensers/foam/Initialize() . = ..() reagents.add_reagent("firefoam",1000) +//Helium3 +/obj/structure/reagent_dispensers/he3 + name = "/improper He3 tank" + desc = "A Helium3 tank." + icon_state = "he3" + amount_per_transfer_from_this = 10 + +/obj/structure/reagent_dispenser/he3/Initialize() + ..() + reagents.add_reagent("helium3",1000) + +/* + * Misc + */ + /obj/structure/reagent_dispensers/fueltank/barrel name = "hazardous barrel" desc = "An open-topped barrel full of nasty-looking liquid." + icon = "icons/obj/objects_vr.dmi" icon_state = "barrel" modded = TRUE @@ -433,7 +449,7 @@ /obj/structure/reagent_dispensers/acid/Initialize() . = ..() reagents.add_reagent("sacid", 1000) - + //Cooking oil refill tank /obj/structure/reagent_dispensers/cookingoil name = "cooking oil tank" @@ -457,14 +473,3 @@ reagents.splash_area(get_turf(src), 3) visible_message(span("danger", "The [src] bursts open, spreading oil all over the area.")) qdel(src) - -/obj/structure/reagent_dispensers/he3 - name = "fueltank" - desc = "A fueltank." - icon = 'icons/obj/objects.dmi' - icon_state = "weldtank" - amount_per_transfer_from_this = 10 - -/obj/structure/reagent_dispenser/he3/Initialize() - ..() - reagents.add_reagent("helium3",1000) diff --git a/icons/obj/chemical_tanks.dmi b/icons/obj/chemical_tanks.dmi new file mode 100644 index 0000000000000000000000000000000000000000..277548320447052bd2b664c0049f618a4a7ad440 GIT binary patch literal 7341 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 literal 0 HcmV?d00001