From c3148b76d029f79ba6430f87e244aa319da91c4e Mon Sep 17 00:00:00 2001 From: "d_h2005@yahoo.com" Date: Sun, 24 Feb 2013 00:23:31 +0000 Subject: [PATCH] -Moves the biogen and sextractor code into the hydroponics module folder, moves the optable code into /structures. -Committing SuperSayu's patch for slimey grenades. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5770 316c924e-a436-60f5-8080-3fe189b3f50e --- .../items/weapons/grenades/chem_grenade.dm | 14 ++++++- .../structures}/OpTable.dm | 0 .../hydroponics}/biogenerator.dm | 0 .../hydroponics}/seed_extractor.dm | 0 tgstation.dme | 39 +++++++++++++++++-- 5 files changed, 49 insertions(+), 4 deletions(-) rename code/game/{machinery => objects/structures}/OpTable.dm (100%) rename code/{game/machinery => modules/hydroponics}/biogenerator.dm (100%) rename code/{game/machinery => modules/hydroponics}/seed_extractor.dm (100%) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 1865d504bea..6ce41101360 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -227,7 +227,7 @@ desc = "An oversized grenade that affects a larger area." icon_state = "large_grenade" allowed_containers = list(/obj/item/weapon/reagent_containers/glass,/obj/item/weapon/reagent_containers/food/condiment, - /obj/item/weapon/reagent_containers/food/drinks, /obj/item/slime_extract) + /obj/item/weapon/reagent_containers/food/drinks) origin_tech = "combat=3;materials=3" affected_area = 4 prime() @@ -281,6 +281,18 @@ spawn(50) //To make sure all reagents can work del(src) //correctly before deleting the grenade. + //I tried to just put it in the allowed_containers list but + //if you do that it must have reagents. If you're going to + //make a special case you might as well do it explicitly. -Sayu + attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/slime_extract) && stage == 1 && path != 2) + user << "\blue You add \the [W] to the assembly." + user.drop_item() + W.loc = src + beakers += W + else + return ..(W,user) + /obj/item/weapon/grenade/chem_grenade/metalfoam name = "Metal-Foam Grenade" desc = "Used for emergency sealing of air breaches." diff --git a/code/game/machinery/OpTable.dm b/code/game/objects/structures/OpTable.dm similarity index 100% rename from code/game/machinery/OpTable.dm rename to code/game/objects/structures/OpTable.dm diff --git a/code/game/machinery/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm similarity index 100% rename from code/game/machinery/biogenerator.dm rename to code/modules/hydroponics/biogenerator.dm diff --git a/code/game/machinery/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm similarity index 100% rename from code/game/machinery/seed_extractor.dm rename to code/modules/hydroponics/seed_extractor.dm diff --git a/tgstation.dme b/tgstation.dme index cdb2e8cae8b..f48dfbe7196 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,6 +6,39 @@ // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "html" +#define FILE_DIR "icons" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/pipes" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "maps" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES @@ -246,7 +279,6 @@ #include "code\game\machinery\atmo_control.dm" #include "code\game\machinery\autolathe.dm" #include "code\game\machinery\Beacon.dm" -#include "code\game\machinery\biogenerator.dm" #include "code\game\machinery\buttons.dm" #include "code\game\machinery\cell_charger.dm" #include "code\game\machinery\cloning.dm" @@ -265,14 +297,12 @@ #include "code\game\machinery\mass_driver.dm" #include "code\game\machinery\navbeacon.dm" #include "code\game\machinery\newscaster.dm" -#include "code\game\machinery\OpTable.dm" #include "code\game\machinery\overview.dm" #include "code\game\machinery\portable_turret.dm" #include "code\game\machinery\recharger.dm" #include "code\game\machinery\rechargestation.dm" #include "code\game\machinery\requests_console.dm" #include "code\game\machinery\robot_fabricator.dm" -#include "code\game\machinery\seed_extractor.dm" #include "code\game\machinery\shieldgen.dm" #include "code\game\machinery\Sleeper.dm" #include "code\game\machinery\spaceheater.dm" @@ -547,6 +577,7 @@ #include "code\game\objects\structures\morgue.dm" #include "code\game\objects\structures\musician.dm" #include "code\game\objects\structures\noticeboard.dm" +#include "code\game\objects\structures\OpTable.dm" #include "code\game\objects\structures\safe.dm" #include "code\game\objects\structures\signs.dm" #include "code\game\objects\structures\tables_racks.dm" @@ -750,11 +781,13 @@ #include "code\modules\flufftext\Hallucination.dm" #include "code\modules\flufftext\TextFilters.dm" #include "code\modules\food\recipes_microwave.dm" +#include "code\modules\hydroponics\biogenerator.dm" #include "code\modules\hydroponics\grown.dm" #include "code\modules\hydroponics\growninedible.dm" #include "code\modules\hydroponics\hydroitemcode.dm" #include "code\modules\hydroponics\hydroitemdefines.dm" #include "code\modules\hydroponics\hydroponics.dm" +#include "code\modules\hydroponics\seed_extractor.dm" #include "code\modules\hydroponics\seeds.dm" #include "code\modules\library\lib_items.dm" #include "code\modules\library\lib_machines.dm"