From 2f830a8f2d0174df814425d6abdfc6a6913bb072 Mon Sep 17 00:00:00 2001 From: Dahlular Date: Wed, 4 May 2022 14:49:29 -0600 Subject: [PATCH] quick merge fix --- .../objects/items/stacks/tiles/tile_types.dm | 31 +++++++++++++++++++ tgstation.dme | 10 ++++++ 2 files changed, 41 insertions(+) diff --git a/hyperstation/code/game/objects/items/stacks/tiles/tile_types.dm b/hyperstation/code/game/objects/items/stacks/tiles/tile_types.dm index c2de74d5b..1faa2102b 100644 --- a/hyperstation/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/hyperstation/code/game/objects/items/stacks/tiles/tile_types.dm @@ -1,3 +1,34 @@ +//Farm things +/turf/open/floor/ + var/farm_quality = 0 //all tiles have a farm quality, which is for farm animals to enjoy. 0 = worse 100 = best! + +//Grass quality +/turf/open/floor/grass + farm_quality = 50 + +/turf/open/floor/grass/fairy + farm_quality = 70 + +//Hay +/obj/item/stack/tile/hay + name = "hay bedding tile" + singular_name = "hay bedding tile" + desc = "A patch of bundled hay." + icon = 'hyperstation/icons/obj/tiles.dmi' + icon_state = "tile_hay" + item_state = "tile_hay" + turf_type = /turf/open/floor/grass/hay + resistance_flags = FLAMMABLE + +/turf/open/floor/grass/hay //like grass + name = "hay bedding" + icon = 'hyperstation/icons/obj/hydroponics/harvest.dmi' + desc = "A patch of bundled hay, to help keep animals happy." + icon_state = "hay" + farm_quality = 100 //the best for farming! + floor_tile = /obj/item/stack/tile/hay + +//Carpets /obj/item/stack/tile/carpet/kinaris name = "gilded carpet" icon = 'hyperstation/icons/obj/tiles.dmi' diff --git a/tgstation.dme b/tgstation.dme index 074f0058f..ac31ddd9a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -50,6 +50,7 @@ #include "code\__DEFINES\food.dm" #include "code\__DEFINES\footsteps.dm" #include "code\__DEFINES\hud.dm" +#include "code\__DEFINES\hyper_arousal.dm" #include "code\__DEFINES\integrated_electronics.dm" #include "code\__DEFINES\interaction_flags.dm" #include "code\__DEFINES\inventory.dm" @@ -3107,9 +3108,11 @@ #include "hyperstation\code\game\machinery\computer\timeclock.dm" #include "hyperstation\code\game\objects\railings.dm" #include "hyperstation\code\game\objects\effects\landmarks.dm" +#include "hyperstation\code\game\objects\items\cards.dm" #include "hyperstation\code\game\objects\items\cards_ids.dm" #include "hyperstation\code\game\objects\items\coconutcannon.dm" #include "hyperstation\code\game\objects\items\cosmetics.dm" +#include "hyperstation\code\game\objects\items\lovedice.dm" #include "hyperstation\code\game\objects\items\circuitboards\computer_circuitboards.dm" #include "hyperstation\code\game\objects\items\stacks\tiles\tile_types.dm" #include "hyperstation\code\game\objects\items\storage\big_bag.dm" @@ -3147,6 +3150,7 @@ #include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm" #include "hyperstation\code\modules\arousal\arousalhud.dm" #include "hyperstation\code\modules\arousal\creampie.dm" +#include "hyperstation\code\modules\arousal\expansion.dm" #include "hyperstation\code\modules\busy_space\air_traffic.dm" #include "hyperstation\code\modules\busy_space\atc_controller.dm" #include "hyperstation\code\modules\busy_space\loremaster.dm" @@ -3171,6 +3175,7 @@ #include "hyperstation\code\modules\events\crystalline_reentry.dm" #include "hyperstation\code\modules\events\crystalloid_entities.dm" #include "hyperstation\code\modules\food_and_drinks\recipes\drinks_recipes.dm" +#include "hyperstation\code\modules\hydroponics\grown\kalyna.dm" #include "hyperstation\code\modules\integrated_electronics\input.dm" #include "hyperstation\code\modules\jobs\job_types\_job.dm" #include "hyperstation\code\modules\jobs\job_types\civilian.dm" @@ -3185,10 +3190,13 @@ #include "hyperstation\code\modules\mob\living\carbon\carbon.dm" #include "hyperstation\code\modules\mob\living\silicon\robot\robot.dm" #include "hyperstation\code\modules\mob\living\silicon\robot\robot_modules.dm" +#include "hyperstation\code\modules\mob\living\simple_animal\friendly\chicken_types.dm" +#include "hyperstation\code\modules\mob\living\simple_animal\friendly\farm_animals.dm" #include "hyperstation\code\modules\patreon\patreon.dm" #include "hyperstation\code\modules\power\reactor\fuel_rods.dm" #include "hyperstation\code\modules\power\reactor\rbmk.dm" #include "hyperstation\code\modules\power\reactor\reactor_cargo.dm" +#include "hyperstation\code\modules\reagents\chemistry\reagents\alcohol_reagents.dm" #include "hyperstation\code\modules\reagents\chemistry\reagents\drink_reagents.dm" #include "hyperstation\code\modules\reagents\chemistry\reagents\food_reagents.dm" #include "hyperstation\code\modules\reagents\chemistry\reagents\hydroponics_reactions.dm" @@ -3210,6 +3218,7 @@ #include "hyperstation\code\obj\economy.dm" #include "hyperstation\code\obj\fleshlight.dm" #include "hyperstation\code\obj\fluff.dm" +#include "hyperstation\code\obj\jacuzzi.dm" #include "hyperstation\code\obj\kinkyclothes.dm" #include "hyperstation\code\obj\leash.dm" #include "hyperstation\code\obj\lunaritems.dm" @@ -3223,6 +3232,7 @@ #include "hyperstation\code\obj\sounding.dm" #include "hyperstation\code\obj\stargate_clothing.dm" #include "hyperstation\code\obj\vibrator.dm" +#include "hyperstation\code\obj\farming\farming.dm" #include "hyperstation\code\obj\items\lorebooks.dm" #include "hyperstation\code\obj\Kitchen compliances\reagentblender.dm" #include "hyperstation\code\obj\Lambent\gloves.dm"