From 89aa5852c8801956011fb7964e4bfa29b0762b59 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 8 Oct 2019 00:30:54 -0700 Subject: [PATCH] Merge pull request #9226 from Trilbyspaceclone/unmodular_2 Unmodulars a few things + new sprite + new welder tank(unused --- code/modules/reagents/reagent_dispenser.dm | 140 +++++++++++++----- .../research/designs/weapon_designs.dm | 16 ++ icons/obj/objects.dmi | Bin 104501 -> 105664 bytes modular_citadel/icons/firstaid.dmi | Bin 3060 -> 3073 bytes tgstation.dme | 3 - 5 files changed, 116 insertions(+), 43 deletions(-) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index e6f9df71..17ad95ba 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -39,6 +39,10 @@ else qdel(src) +/////////////// +//Water Tanks// +/////////////// + /obj/structure/reagent_dispensers/watertank name = "water tank" desc = "A water tank." @@ -57,12 +61,52 @@ reagent_id = "firefighting_foam" tank_volume = 500 +/obj/structure/reagent_dispensers/water_cooler + name = "liquid cooler" + desc = "A machine that dispenses liquid to drink." + icon = 'icons/obj/vending.dmi' + icon_state = "water_cooler" + anchored = TRUE + tank_volume = 500 + var/paper_cups = 25 //Paper cups left from the cooler + +/obj/structure/reagent_dispensers/water_cooler/examine(mob/user) + ..() + if (paper_cups > 1) + to_chat(user, "There are [paper_cups] paper cups left.") + else if (paper_cups == 1) + to_chat(user, "There is one paper cup left.") + else + to_chat(user, "There are no paper cups left.") + +/obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/user) + . = ..() + if(.) + return + if(!paper_cups) + to_chat(user, "There aren't any cups left!") + return + user.visible_message("[user] takes a cup from [src].", "You take a paper cup from [src].") + var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src)) + user.put_in_hands(S) + paper_cups-- + +////////////// +//Fuel Tanks// +////////////// + /obj/structure/reagent_dispensers/fueltank name = "fuel tank" desc = "A tank full of industrial welding fuel. Do not consume." icon_state = "fuel" reagent_id = "welding_fuel" +/obj/structure/reagent_dispensers/fueltank/high //Unused - Good for ghost roles + name = "high-capacity fuel tank" + desc = "A now illegal tank, full of highly pressurized industrial welding fuel. Do not consume or have a open flame close to this tank." + icon_state = "fuel_high" + tank_volume = 3000 + /obj/structure/reagent_dispensers/fueltank/boom() explosion(get_turf(src), 0, 1, 5, flame_range = 5) qdel(src) @@ -117,6 +161,9 @@ return return ..() +/////////////////// +//Misc Dispenders// +/////////////////// /obj/structure/reagent_dispensers/peppertank name = "pepper spray refiller" @@ -131,36 +178,24 @@ if(prob(1)) desc = "IT'S PEPPER TIME, BITCH!" - -/obj/structure/reagent_dispensers/water_cooler - name = "liquid cooler" - desc = "A machine that dispenses liquid to drink." - icon = 'icons/obj/vending.dmi' - icon_state = "water_cooler" +/obj/structure/reagent_dispensers/virusfood + name = "virus food dispenser" + desc = "A dispenser of low-potency virus mutagenic." + icon_state = "virus_food" anchored = TRUE - tank_volume = 500 - var/paper_cups = 25 //Paper cups left from the cooler + density = FALSE + reagent_id = "virusfood" -/obj/structure/reagent_dispensers/water_cooler/examine(mob/user) - . = ..() - if (paper_cups > 1) - . += "There are [paper_cups] paper cups left." - else if (paper_cups == 1) - . += "There is one paper cup left." - else - . += "There are no paper cups left." +/obj/structure/reagent_dispensers/cooking_oil + name = "vat of cooking oil" + desc = "A huge metal vat with a tap on the front. Filled with cooking oil for use in frying food." + icon_state = "vat" + anchored = TRUE + reagent_id = "cooking_oil" -/obj/structure/reagent_dispensers/water_cooler/attack_hand(mob/living/user) - . = ..() - if(.) - return - if(!paper_cups) - to_chat(user, "There aren't any cups left!") - return - user.visible_message("[user] takes a cup from [src].", "You take a paper cup from [src].") - var/obj/item/reagent_containers/food/drinks/sillycup/S = new(get_turf(src)) - user.put_in_hands(S) - paper_cups-- +//////// +//Kegs// +//////// /obj/structure/reagent_dispensers/beerkeg name = "beer keg" @@ -173,19 +208,44 @@ if(!QDELETED(src)) qdel(src) +/obj/structure/reagent_dispensers/keg + name = "keg" + desc = "A keg." + icon = 'modular_citadel/icons/obj/objects.dmi' + icon_state = "keg" + reagent_id = "water" -/obj/structure/reagent_dispensers/virusfood - name = "virus food dispenser" - desc = "A dispenser of low-potency virus mutagenic." - icon_state = "virus_food" - anchored = TRUE - density = FALSE - reagent_id = "virusfood" +/obj/structure/reagent_dispensers/keg/mead + name = "keg of mead" + desc = "A keg of mead." + icon_state = "orangekeg" + reagent_id = "mead" +/obj/structure/reagent_dispensers/keg/aphro + name = "keg of aphrodisiac" + desc = "A keg of aphrodisiac." + icon_state = "pinkkeg" + reagent_id = "aphro" -/obj/structure/reagent_dispensers/cooking_oil - name = "vat of cooking oil" - desc = "A huge metal vat with a tap on the front. Filled with cooking oil for use in frying food." - icon_state = "vat" - anchored = TRUE - reagent_id = "cooking_oil" +/obj/structure/reagent_dispensers/keg/aphro/strong + name = "keg of strong aphrodisiac" + desc = "A keg of strong and addictive aphrodisiac." + reagent_id = "aphro+" + +/obj/structure/reagent_dispensers/keg/milk + name = "keg of milk" + desc = "It's not quite what you were hoping for." + icon_state = "whitekeg" + reagent_id = "milk" + +/obj/structure/reagent_dispensers/keg/semen + name = "keg of semen" + desc = "Dear lord, where did this even come from?" + icon_state = "whitekeg" + reagent_id = "semen" + +/obj/structure/reagent_dispensers/keg/gargle + name = "keg of pan galactic gargleblaster" + desc = "A keg of... wow that's a long name." + icon_state = "bluekeg" + reagent_id = "gargleblaster" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 7dd85ea1..02fd6c5f 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -77,6 +77,22 @@ build_path = /obj/item/ammo_box/magazine/wt550m9/wtic departmental_flags = DEPARTMENTAL_FLAG_SECURITY +/datum/design/mag_oldsmg/tx_mag + name = "WT-550 Semi-Auto SMG Uranium Magazine (4.6x30mm TX)" + desc = "A 20 round uranium tipped magazine for the out of date security WT-550 Semi-Auto SMG." + id = "mag_oldsmg_tx" + materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wttx + departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +/datum/design/mag_oldsmg/rubber_mag + name = "WT-550 Semi-Auto SMG rubberbullets Magazine (4.6x30mm rubber)" + desc = "A 20 round rubber shots magazine for the out of date security WT-550 Semi-Auto SMG" + id = "mag_oldsmg_rubber" + materials = list(MAT_METAL = 6000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtrubber + departmental_flags = DEPARTMENTAL_FLAG_SECURITY + ////////////// //Ammo Shells/ ////////////// diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index e7fdd874a3e3d16c5b7ea56c7817bb903a180cc2..834785eebf1796ba1d78bc2e6447232259ae07ac 100644 GIT binary patch delta 13589 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 delta 12419 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 J3VF+r{{f6i^f>?k diff --git a/modular_citadel/icons/firstaid.dmi b/modular_citadel/icons/firstaid.dmi index e7ac37822268e1aeaa5ddb80fca59c8b0697f56e..d061adf9f272da2efab101d65b10d6052e073d96 100644 GIT binary patch delta 2611 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 delta 2598 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 diff --git a/tgstation.dme b/tgstation.dme index 7988c73a..8af24b4d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3209,16 +3209,13 @@ #include "modular_citadel\code\modules\reagents\chemistry\recipes\fermi.dm" #include "modular_citadel\code\modules\reagents\objects\clothes.dm" #include "modular_citadel\code\modules\reagents\objects\items.dm" -#include "modular_citadel\code\modules\reagents\reagent container\cit_kegs.dm" #include "modular_citadel\code\modules\reagents\reagent container\hypospraymkii.dm" #include "modular_citadel\code\modules\reagents\reagent container\hypovial.dm" #include "modular_citadel\code\modules\reagents\reagents\cit_reagents.dm" #include "modular_citadel\code\modules\recycling\disposal\bin.dm" #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm" #include "modular_citadel\code\modules\research\designs\machine_designs.dm" -#include "modular_citadel\code\modules\research\designs\weapon_designs.dm" #include "modular_citadel\code\modules\research\designs\xenobio_designs.dm" -#include "modular_citadel\code\modules\research\designs\weapon_designs\weapon_designs.dm" #include "modular_citadel\code\modules\research\techweb\_techweb.dm" #include "modular_citadel\code\modules\research\xenobiology\xenobio_camera.dm" #include "modular_citadel\code\modules\vehicles\secway.dm"