diff --git a/GainStation13/code/datums/lavaland_ruins.dm b/GainStation13/code/datums/lavaland_ruins.dm index 06c6811c11..c785cf24dd 100644 --- a/GainStation13/code/datums/lavaland_ruins.dm +++ b/GainStation13/code/datums/lavaland_ruins.dm @@ -47,3 +47,11 @@ suffix = "lavaland_surface_cow_barn.dmm" allow_duplicates = TRUE cost = 0 + +/datum/map_template/ruin/lavaland/candyland_choco //GS13 + name = "Candyland Pocket (Choco)" + id = "candyland_choco" + description = "A small pocket of candyland, somehow manifested in the harsh conditions of lavaland." + suffix = "lavaland_surface_candyland_choco.dmm" + allow_duplicates = FALSE + cost = 0 diff --git a/GainStation13/code/game/objects/effects/posters.dm b/GainStation13/code/game/objects/effects/posters.dm index c1e72484a7..d378f5d6c1 100644 --- a/GainStation13/code/game/objects/effects/posters.dm +++ b/GainStation13/code/game/objects/effects/posters.dm @@ -1,11 +1,11 @@ /obj/structure/sign/poster/official/gatito - name = "Gato Poster" + name = "GATO" desc = "A poster from the Gato company, it reads: 'Remember to take care of your station!' " icon_state = "gato13" icon = 'GainStation13/icons/obj/contraband.dmi' /obj/structure/sign/poster/official/captainposter - name = "Respect your captain poster" + name = "Respect your captain" desc = "A poster from the Gato company, it reads: 'Your captain is always watching, do not do anything suspicious.' " icon_state = "capitan" icon = 'GainStation13/icons/obj/contraband.dmi' @@ -17,7 +17,7 @@ icon = 'GainStation13/icons/obj/contraband.dmi' /obj/structure/sign/poster/official/libraryposter - name = "Motivational Poster" + name = "Motivational" desc = "A poster motivating you in reading books, reading this is already giving you a headache." icon_state = "libraryposter" icon = 'GainStation13/icons/obj/contraband.dmi' @@ -28,42 +28,78 @@ icon_state = "poster2_legit" icon = 'GainStation13/icons/obj/contraband.dmi' +/obj/structure/sign/poster/official/hoverchair + name = "Take A Load Off" + desc = "A poster advertising freely available wheelchairs and hoverchairs, not only for the disabled, but for horizontally tall too." + icon_state = "poster36_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/official/calorite + name = "Calorite Warning" + desc = "A poster warning workers of the dangers of calorite. Be wary when making contact with this mass-multiplicating material!" + icon_state = "poster37_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/official/fatorays + name = "NutriTech Weapons" + desc = "An informative poster showing off a line of weapon designs from the NutriTech design line." + icon_state = "poster38_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/official/waddle + name = "Waddle" + desc = "A poster enticing GATO employees to enjoy the free benefit of a mobility support exoskeleton." + icon_state = "poster39_legit" + icon = 'GainStation13/icons/obj/contraband.dmi' + +//contraband posters /obj/structure/sign/poster/contraband/corn_oil - name = "Corn Oil Poster" + name = "Corn Oil" desc = "A strange poster advertising corn oil beverage. Who would want to drink that...?" icon_state = "poster45" icon = 'GainStation13/icons/obj/contraband.dmi' /obj/structure/sign/poster/contraband/supermatter - name = "Supermatter Warning Poster" + name = "Supermatter Warning" desc = "In case it wasn't already obvious, you shouldn't poke this giant yellow crystal..." icon_state = "poster46" icon = 'GainStation13/icons/obj/contraband.dmi' /obj/structure/sign/poster/contraband/chonk - name = "CHONK POSTER" + name = "CHONK" desc = "Next time eat a salad." icon_state = "poster47" icon = 'GainStation13/icons/obj/contraband.dmi' /obj/structure/sign/poster/contraband/missingpizza - name = "Missing Pizza Poster" + name = "Missing Pizza" desc = "On GS13, it isn't uncommon to lose your food whenever you look away..." icon_state = "poster48" icon = 'GainStation13/icons/obj/contraband.dmi' /obj/structure/sign/poster/contraband/chefpropaganda - name = "Chef Propaganda Poster" + name = "Chef Propaganda" desc = "Enlist and learn how to cook nothing else but burgers, pizza and bread TODAY!" icon_state = "poster49" icon = 'GainStation13/icons/obj/contraband.dmi' /obj/structure/sign/poster/contraband/malta - name = "Malta Poster" + name = "Malta" desc = "A poster from terran sectors, suggesting non-existence of mythical country of Malta." icon_state = "poster50" icon = 'GainStation13/icons/obj/contraband.dmi' +/obj/structure/sign/poster/contraband/gulp + name = "Just Gulp" + desc = "Keep that hose strapped to your mouth and let your worries melt away. Just keep gulping." + icon_state = "poster51" + icon = 'GainStation13/icons/obj/contraband.dmi' + +/obj/structure/sign/poster/contraband/loosen + name = "Loosen" + desc = "A broken belt is a sign progress - so loosen up!" + icon_state = "poster52" + icon = 'GainStation13/icons/obj/contraband.dmi' //recoloring of propaganda posters - from NT blue to GT pink /obj/structure/sign/poster/gato/safety diff --git a/GainStation13/code/game/objects/structures/spawner.dm b/GainStation13/code/game/objects/structures/spawner.dm new file mode 100644 index 0000000000..d68f766846 --- /dev/null +++ b/GainStation13/code/game/objects/structures/spawner.dm @@ -0,0 +1,66 @@ +/obj/structure/spawner/candy + name = "candyland tendril" + desc = "A sweet tendril spewing out all sorts of teeth-rotting creatures." + + icon = 'GainStation13/icons/obj/gslight.dmi' + icon_state = "candylight" + + faction = list("mining") + max_mobs = 6 + max_integrity = 250 + mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril) + var/loot_type = /obj/structure/closet/crate/necropolis/tendril/all + + move_resist=INFINITY // just killing it tears a massive hole in the ground, let's not move it + anchored = TRUE + + var/gps = null + var/obj/effect/light_emitter/tendril/emitted_light + +/obj/structure/spawner/candy/creamdemon + mob_types = list(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast/cream_demon) + max_mobs = 2 + +/obj/structure/spawner/candy/chocoslime + mob_types = list(/mob/living/simple_animal/hostile/feed/chocolate_slime) + +/obj/structure/spawner/candy/magehand + mob_types = list(/mob/living/simple_animal/hostile/fatten/magehand) + max_mobs = 10 + +/obj/structure/spawner/candy/creambeast + mob_types = list(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast) + + +/obj/structure/spawner/candy/Initialize(mapload) + . = ..() + emitted_light = new(loc) + for(var/F in RANGE_TURFS(1, src)) + if(ismineralturf(F)) + var/turf/closed/mineral/M = F + M.ScrapeAway(null, CHANGETURF_IGNORE_AIR) + gps = new /obj/item/gps/internal(src) + GLOB.tendrils += src + +/obj/structure/spawner/candy/deconstruct(disassembled) + new /obj/effect/collapse(loc) + new loot_type(loc) + return ..() + + +/obj/structure/spawner/candy/Destroy() + var/last_tendril = TRUE + if(GLOB.tendrils.len>1) + last_tendril = FALSE + + if(last_tendril && !(flags_1 & ADMIN_SPAWNED_1)) + if(SSachievements.achievements_enabled) + for(var/mob/living/L in view(7,src)) + if(L.stat || !L.client) + continue + L.client.give_award(/datum/award/achievement/boss/tendril_exterminator, L) + L.client.give_award(/datum/award/score/tendril_score, L) //Progresses score by one + GLOB.tendrils -= src + QDEL_NULL(emitted_light) + QDEL_NULL(gps) + return ..() diff --git a/GainStation13/code/game/plushes.dm b/GainStation13/code/game/plushes.dm index d0874694a3..9d3839f0fb 100644 --- a/GainStation13/code/game/plushes.dm +++ b/GainStation13/code/game/plushes.dm @@ -87,3 +87,9 @@ desc = "A plush of a pale demon twink." icon_state = "kot" attack_verb = list("squished", "hugged", "kissed") + +/obj/item/toy/plush/gs13/gatito + name = "Gatito plushie" + desc = "Cutie kitty meow meow gatito plushie! Corporate flavor!!" + icon_state = "gatito" + attack_verb = list("squished", "hugged", "meowed") diff --git a/GainStation13/code/modules/gym/gym.dm b/GainStation13/code/modules/gym/gym.dm index bf8e2feb55..0b64bdb059 100644 --- a/GainStation13/code/modules/gym/gym.dm +++ b/GainStation13/code/modules/gym/gym.dm @@ -35,8 +35,8 @@ /obj/machinery/treadmill name = "treadmill" desc = "A treadmil, for losing weight!" - icon = 'icons/obj/recycling.dmi' - icon_state = "conveyor0" + icon = 'GainStation13/icons/obj/structure/treadmill.dmi' + icon_state = "treadmill" circuit = /obj/item/circuitboard/machine/treadmill var/fatloss = -10 diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm index 30b19ff574..cfadc2296a 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/fatty_drinks.dm @@ -157,3 +157,53 @@ glass_desc = "Nothing better than cream AND cocoa!" shot_glass_icon_state = "shotglassbrown" use_gs_icon = TRUE + + +/datum/reagent/consumable/oreo_milky + name = "Oreo Milkshake" + description = "For when you feel like pouring cookies down your throat." + color = "#c4ac95ff" + taste_description = "cookies, milk and sugar" + quality = DRINK_GOOD + glass_icon_state = "oreo_milky" + glass_name = "milky oreo shake" + glass_desc = "For when you feel like pouring cookies down your throat." + shot_glass_icon_state = "shotglassbrown" + use_gs_icon = TRUE + +/datum/reagent/consumable/oreo_milky/on_mob_life(mob/living/carbon/M) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + if(M && M?.client?.prefs.weight_gain_food) // GS13 + M.nutrition += 15 * REAGENTS_METABOLISM + else + M.nutrition += 1 + ..() + +/datum/reagent/consumable/oreo_classic + name = "Oreo Cookieshake" + description = "For when you feel like pouring cookies down your throat." + color = "#584532ff" + taste_description = "cookies and sugar" + quality = DRINK_GOOD + glass_icon_state = "oreo_classic" + glass_name = "oreo shake" + glass_desc = "For when you feel like pouring cookies down your throat." + shot_glass_icon_state = "shotglassbrown" + use_gs_icon = TRUE + +/datum/reagent/consumable/oreo_classic/on_mob_life(mob/living/carbon/M) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + if(M && M?.client?.prefs.weight_gain_food) // GS13 + M.nutrition += 15 * REAGENTS_METABOLISM + else + M.nutrition += 1 + ..() + +/obj/structure/reagent_dispensers/keg/lipoifier //gs13 + name = "keg of lipoifier" + desc = "Good luck downing that and not getting beached." + icon_state = "orangekeg" + reagent_id = /datum/reagent/consumable/lipoifier + tank_volume = 300 diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm b/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm index b053f71d19..81a350a3ee 100644 --- a/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/recipes/fatdrinks.dm @@ -54,9 +54,45 @@ results = list(/datum/reagent/consumable/milkshake_chocolate = 3) required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/coco = 1) -/obj/structure/reagent_dispensers/keg/lipoifier //gs13 - name = "keg of lipoifier" - desc = "Good luck downing that and not getting beached." - icon_state = "orangekeg" - reagent_id = /datum/reagent/consumable/lipoifier - tank_volume = 300 +/datum/chemical_reaction/heavy_cafe1 + name = "Heavy Cafe" + id = /datum/reagent/consumable/heavy_cafe + results = list(/datum/reagent/consumable/heavy_cafe = 3) + required_reagents = list(/datum/reagent/consumable/cafe_latte = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/cream = 1) + +/datum/chemical_reaction/oreo_classic + name = "Oreo Classic" + id = /datum/reagent/consumable/oreo_classic + results = list(/datum/reagent/consumable/oreo_classic = 3) + required_reagents = list(/datum/reagent/consumable/flour = 2, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 1) + +/datum/chemical_reaction/oreo_milky + name = "Oreo Milky" + id = /datum/reagent/consumable/oreo_milky + results = list(/datum/reagent/consumable/oreo_milky = 3) + required_reagents = list(/datum/reagent/consumable/flour = 2, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/milk = 1) + +/obj/item/reagent_containers/food/snacks/store/cake/hugeoreo + name = "GlucoBomb Oreo Cookieshake" + desc = "Are you out of your fucking mind?" + icon = 'GainStation13/icons/obj/food/food64x64.dmi' + icon_state = "oreo_huge" + pixel_x = -16 + pixel_y = -16 + inhand_x_dimension = 64 + inhand_y_dimension = 64 + bonus_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/sugar = 20) + list_reagents = list(/datum/reagent/consumable/nutriment = 200, /datum/reagent/consumable/sugar = 100, /datum/reagent/consumable/milk = 50) + tastes = list("sugar" = 1, "sugar shock" = 1, "syrup" = 1, "slop" = 1, "overwhelming surge of calories" = 10) + foodtype = DAIRY | JUNKFOOD + +/datum/crafting_recipe/food/hugeoreo + name = "GlucoBomb Oreo Cookieshake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/cheese = 2, + /datum/reagent/consumable/sugar = 100, + /datum/reagent/consumable/milk = 100, + /datum/reagent/consumable/cream = 50 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/hugeoreo + subcategory = CAT_CAKE diff --git a/GainStation13/code/modules/research/designs/nutri_designs.dm b/GainStation13/code/modules/research/designs/nutri_designs.dm index 90aa4d546e..180d9fd9ac 100644 --- a/GainStation13/code/modules/research/designs/nutri_designs.dm +++ b/GainStation13/code/modules/research/designs/nutri_designs.dm @@ -25,7 +25,7 @@ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY /datum/design/alter_ray_metabolism - name = "AL-T-Ray: Metabolism" + name = "AlteRay: Metabolism" id = "alter_ray_metabolism" build_type = PROTOLATHE materials = list(/datum/material/iron = 10000, /datum/material/glass = 8000, /datum/material/calorite = 26000) @@ -36,7 +36,7 @@ /datum/design/alter_ray_reverser - name = "AL-T-Ray: Reverser" + name = "AlteRay: Reverser" id = "alter_ray_reverser" build_type = PROTOLATHE materials = list(/datum/material/iron = 10000, /datum/material/glass = 8000, /datum/material/calorite = 26000) diff --git a/GainStation13/code/obj/weapons/alter_rays.dm b/GainStation13/code/obj/weapons/alter_rays.dm index 76245e1bec..231f243370 100644 --- a/GainStation13/code/obj/weapons/alter_rays.dm +++ b/GainStation13/code/obj/weapons/alter_rays.dm @@ -4,8 +4,8 @@ /obj/item/gun/energy/laser/alter_ray name = "alter-ray" - icon = 'icons/obj/guns/energy.dmi' - icon_state = "lasernew" + icon = 'GainStation13/icons/obj/weapons/alter_ray.dmi' + icon_state = "alter_ray" desc = "This weapon is capable of altering one's body capabilities." item_state = null selfcharge = EGUN_SELFCHARGE @@ -14,7 +14,7 @@ clumsy_check = 1 /obj/item/gun/energy/laser/alter_ray/gainrate - name = "AL-T-Ray: Metabolism" + name = "AlteRay: Metabolism" desc = "This weapon is capable of altering one's body capabilities. This model appears to be capable of altering one's weight gain and loss rate by 10%." ammo_type = list(/obj/item/ammo_casing/energy/laser/gainrate_decrease, /obj/item/ammo_casing/energy/laser/gainrate_increase, /obj/item/ammo_casing/energy/laser/lossrate_decrease, /obj/item/ammo_casing/energy/laser/lossrate_increase) @@ -70,7 +70,7 @@ //wg rate increase /obj/item/projectile/alter_ray/gainrate_increase/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) @@ -85,7 +85,7 @@ //wg rate decrease /obj/item/projectile/alter_ray/gainrate_decrease/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) @@ -100,7 +100,7 @@ //wl rate increase /obj/item/projectile/alter_ray/lossrate_increase/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) @@ -114,7 +114,7 @@ //wl rate decrease /obj/item/projectile/alter_ray/lossrate_decrease/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) @@ -123,7 +123,7 @@ return TRUE if(gainer.weight_loss_rate <= 0.1) return FALSE - + return FALSE //ammo casings - these are needed to allow guns to switch between firing modes @@ -148,7 +148,7 @@ //ALTRay for making someone gain from weight loss /obj/item/gun/energy/laser/alter_ray/noloss - name = "AL-T-Ray: Reverser" + name = "AlteRay: Reverser" desc = "This weapon is capable of altering one's body capabilities. This one reverse's ones body functions, to make it so weight loss results in weight gain." ammo_type = list(/obj/item/ammo_casing/energy/laser/lossrate_reverse) @@ -162,7 +162,7 @@ /obj/item/projectile/alter_ray/lossrate_reverse/on_hit(atom/target, blocked) . = ..() - + var/mob/living/carbon/gainer = target if(iscarbon(gainer)) diff --git a/GainStation13/icons/obj/contraband.dmi b/GainStation13/icons/obj/contraband.dmi index ddad119455..4dee7ea43f 100644 Binary files a/GainStation13/icons/obj/contraband.dmi and b/GainStation13/icons/obj/contraband.dmi differ diff --git a/GainStation13/icons/obj/drinks.dmi b/GainStation13/icons/obj/drinks.dmi index cfd98f3f76..218b65e99a 100644 Binary files a/GainStation13/icons/obj/drinks.dmi and b/GainStation13/icons/obj/drinks.dmi differ diff --git a/GainStation13/icons/obj/food/food64x64.dmi b/GainStation13/icons/obj/food/food64x64.dmi index a575437e30..a10bae712c 100644 Binary files a/GainStation13/icons/obj/food/food64x64.dmi and b/GainStation13/icons/obj/food/food64x64.dmi differ diff --git a/GainStation13/icons/obj/plushes.dmi b/GainStation13/icons/obj/plushes.dmi index 30cf5ddc34..3f637d4765 100644 Binary files a/GainStation13/icons/obj/plushes.dmi and b/GainStation13/icons/obj/plushes.dmi differ diff --git a/GainStation13/icons/obj/scale.dmi b/GainStation13/icons/obj/scale.dmi index 4df41e16b2..d55eadf817 100644 Binary files a/GainStation13/icons/obj/scale.dmi and b/GainStation13/icons/obj/scale.dmi differ diff --git a/GainStation13/icons/obj/structure/treadmill.dmi b/GainStation13/icons/obj/structure/treadmill.dmi new file mode 100644 index 0000000000..d4b4cec4d3 Binary files /dev/null and b/GainStation13/icons/obj/structure/treadmill.dmi differ diff --git a/GainStation13/icons/obj/weapons/alter_ray.dmi b/GainStation13/icons/obj/weapons/alter_ray.dmi new file mode 100644 index 0000000000..c6bee3bfbd Binary files /dev/null and b/GainStation13/icons/obj/weapons/alter_ray.dmi differ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_candyland_choco.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_candyland_choco.dmm new file mode 100644 index 0000000000..29f4b6daf9 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_candyland_choco.dmm @@ -0,0 +1,102 @@ +"aj" = (/turf/open/chocolateriver,/area/ruin/powered/gluttony) +"ax" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/store/cake/chocolate{pixel_x = -3; pixel_y = 0},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"aE" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 11; pixel_y = 3},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"bK" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -13; pixel_y = 7},/obj/item/reagent_containers/food/snacks/chocolatebunny,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"cv" = (/obj/structure/barricade/wooden,/obj/structure/fans/tiny/invisible,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"cJ" = (/obj/item/seeds/cocoapod{pixel_x = 4; pixel_y = -3},/obj/item/seeds/cocoapod/vanillapod{pixel_x = -10; pixel_y = -15},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"ec" = (/turf/closed/indestructible/chocolate{icon_state = "choco_wall2"},/area/ruin/powered/gluttony) +"eW" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 6; pixel_y = -6},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"fe" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -8; pixel_y = 10},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"fO" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 10; pixel_y = -7},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"fW" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -7; pixel_y = -14},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"gY" = (/obj/item/reagent_containers/food/drinks/bottle/cream{pixel_x = -1; pixel_y = -1},/obj/item/reagent_containers/food/drinks/bottle/cream{pixel_x = 11; pixel_y = 12},/obj/item/reagent_containers/food/drinks/bottle/cream{pixel_x = 13; pixel_y = -6},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"iH" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -10; pixel_y = 9},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"ji" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = 10; pixel_y = -7},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"jl" = (/turf/open/floor/wood/damturf/broken3,/area/ruin/powered/gluttony) +"lF" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/store/cake/chocolate{pixel_x = 1; pixel_y = 0},/obj/item/reagent_containers/food/snacks/store/cake/chocolate{pixel_x = 15; pixel_y = 15},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"nG" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -8; pixel_y = 8},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"oF" = (/obj/structure/table/wood,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"oP" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -6; pixel_y = 6},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"oZ" = (/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast/cream_demon,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"pg" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 8; pixel_y = 5},/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -7; pixel_y = -6},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"re" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = 6; pixel_y = -5},/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -8; pixel_y = 5},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"rp" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 6; pixel_y = -1},/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -14; pixel_y = 12},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"ru" = (/turf/open/floor/wood/damturf/broken5,/area/ruin/powered/gluttony) +"rW" = (/mob/living/simple_animal/hostile/feed/chocolate_slime,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"ss" = (/obj/structure/barricade/wooden,/obj/structure/barricade/wooden/crude,/obj/structure/fans/tiny/invisible,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"sP" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -4; pixel_y = -9},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"wH" = (/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 9; pixel_y = 0},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = -8; pixel_y = 16},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 0; pixel_y = 5},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = -20; pixel_y = 14},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 18; pixel_y = 5},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 8; pixel_y = 17},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = -12; pixel_y = 1},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 2; pixel_y = -11},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 12; pixel_y = -8},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = -13; pixel_y = -9},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"xn" = (/obj/structure/railing{dir = 1},/turf/open/chocolateriver,/area/ruin/powered/gluttony) +"xz" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -11; pixel_y = 5},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"yq" = (/turf/template_noop,/area/template_noop) +"yt" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -6; pixel_y = -8},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"yJ" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = 11; pixel_y = 6},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"zO" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = 6; pixel_y = 15},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Ab" = (/mob/living/simple_animal/hostile/feed/chocolate_slime,/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 7; pixel_y = 10},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Af" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/chocolatebar{pixel_x = 3; pixel_y = 7},/obj/item/reagent_containers/food/snacks/candy{pixel_x = -12; pixel_y = 12},/obj/item/reagent_containers/food/snacks/candy{pixel_x = -11; pixel_y = -3},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Ah" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 12; pixel_y = -6},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Aw" = (/obj/item/reagent_containers/food/snacks/donut/choco,/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 7; pixel_y = 17},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 17; pixel_y = -2},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Bu" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -15; pixel_y = 10},/obj/item/reagent_containers/food/snacks/chocolatebunny,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Cm" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 11; pixel_y = -11},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Db" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 7; pixel_y = 19},/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 9; pixel_y = 0},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Fy" = (/mob/living/simple_animal/hostile/feed/chocolate_slime,/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -6; pixel_y = 3},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Hw" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -8; pixel_y = 19},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"HB" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -2; pixel_y = -8},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"IF" = (/obj/item/chair/wood/wings,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"IR" = (/obj/machinery/iv_drip/feeding_tube,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Jg" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -7; pixel_y = 6},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"JG" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = 3; pixel_y = -16},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Km" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -7; pixel_y = -14},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 9; pixel_y = 12},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Kz" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 5; pixel_y = 4},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Lg" = (/obj/item/reagent_containers/food/snacks/chocolatebunny,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"LG" = (/obj/item/reagent_containers/food/snacks/chocolatebunny,/turf/open/chocolateriver,/area/ruin/powered/gluttony) +"MZ" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -5; pixel_y = -8},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Nb" = (/obj/item/flashlight/lantern{icon_state = "lantern-on"; on = 1; pixel_y = 8; pixel_x = 5},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Ns" = (/obj/item/reagent_containers/food/snacks/donut/choco,/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = -4; pixel_y = 12},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = -11; pixel_y = -8},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"NO" = (/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Oc" = (/obj/structure/railing,/turf/open/chocolateriver,/area/ruin/powered/gluttony) +"RI" = (/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = -8; pixel_y = 0},/obj/item/reagent_containers/food/snacks/donut/choco{pixel_x = 12; pixel_y = 10},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Sv" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 8; pixel_y = -8},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Tb" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -9; pixel_y = 6},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Ua" = (/obj/structure/spawner/candy/chocoslime,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Un" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -6; pixel_y = 5},/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -8; pixel_y = -9},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Uo" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -5; pixel_y = -10},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"VF" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 7; pixel_y = -5},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"Yp" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/template_noop) +"YS" = (/obj/item/reagent_containers/food/snacks/chocolateegg{pixel_x = -10; pixel_y = 11},/obj/item/reagent_containers/food/snacks/chocolatebunny,/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"YU" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -7; pixel_y = -10},/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = -6; pixel_y = 4},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"YY" = (/obj/item/reagent_containers/food/snacks/tinychocolate{pixel_x = 16; pixel_y = 10},/turf/open/indestructible/chocolate,/area/ruin/powered/gluttony) +"ZS" = (/turf/open/floor/wood/damturf/broken1,/area/ruin/powered/gluttony) + +(1,1,1) = {" +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqajecajajajecececajyqyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqecajajLGajajajajajajajajajyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqecajajajajajajajajajajajajajajajajecyqyqyqyqyqyqyq +yqyqyqyqyqecajajajajajecececececececajajLGajajajyqyqyqyqyqyq +yqyqyqyqyqajajajajajececYSTbNOxzrWececajajajajajajajyqyqyqyq +yqyqYpYpyqajLGajajececNOrWNOMZNObKNOecececajajajajajecyqyqyq +yqyqYpYpajajajecececfeNOecececececJgNOJGececajajajajajyqyqyq +yqyqYpYpOcOcOcecNbNOSvececpgUarpececaENOfWecajajajajajyqyqyq +yqYpYpYpZSrujlssHwLgececUnNONONOreececNbNOececajajajajyqyqyq +yqYpYpYpxnxnxnececececrWNboFAfcJNOnGecNOBuoPecajajLGajajyqyq +yqyqYpYpajajajajecrWcvUoKmNswHAwgYDbecNOrWzOecajajajajajyqyq +yqyqyqYpecajajajecNOececCmRIoZNOIRAbecHBfOeWecajajajajecyqyq +yqyqyqyqajajajajecYULgececlFaxNbIFAhecNOKzececajajajajecyqyq +yqyqyqyqajajajajececytNOecececFyVFececNOLgecajajajajajajyqyq +yqyqyqyqyqecajajajececNOYYrWececececNOjiececajajajajajajyqyq +yqyqyqyqyqyqecajajajecececsPNONONOiHyJececajajajajajecyqyqyq +yqyqyqyqyqyqecajajajajajececececececececajajajajajajecyqyqyq +yqyqyqyqyqyqyqajajajajajajajajajajajajajajLGajajajajyqyqyqyq +yqyqyqyqyqyqyqyqajecajajLGajajajajajajajajajajajajajyqyqyqyq +yqyqyqyqyqyqyqyqyqyqajajececyqyqyqyqecajajajececajyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqajajajyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyq +yqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyqyq +"} diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 69ce4c2686..3235d6fbf3 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -281,7 +281,7 @@ "fx" = (/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "fy" = (/obj/structure/sink/kitchen{pixel_y = 28},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "fz" = (/obj/machinery/processor,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) -"fA" = (/obj/structure/table/reinforced,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar) +"fA" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar) "fB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/open/floor/carpet/gato,/area/ruin/space/has_grav/hotel/guestroom/room_1) "fC" = (/obj/machinery/light{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/hotel) "fD" = (/obj/machinery/vending/wardrobe/chef_wardrobe,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/bar) @@ -337,11 +337,11 @@ "gC" = (/obj/structure/closet/secure_closet/freezer/meat{req_access_txt = "200"},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "gD" = (/obj/structure/table,/obj/item/kitchen/knife/butcher,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "gE" = (/obj/structure/table,/obj/item/reagent_containers/food/condiment/pack/hotsauce,/obj/item/reagent_containers/food/condiment/pack/hotsauce,/obj/item/reagent_containers/food/condiment/pack/ketchup,/obj/item/reagent_containers/food/condiment/pack/ketchup,/obj/item/reagent_containers/glass/beaker,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) -"gF" = (/obj/machinery/vending/cola,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) +"gF" = (/obj/machinery/vending/cola,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) "gG" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) "gH" = (/obj/machinery/light{dir = 1; pixel_y = 16},/obj/structure/flora/ausbushes/lavendergrass,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel) "gI" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/window{dir = 4},/turf/open/floor/grass,/area/ruin/space/has_grav/hotel) -"gJ" = (/obj/structure/closet/secure_closet/freezer/kitchen/mining,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) +"gJ" = (/obj/structure/closet/secure_closet/freezer/kitchen/mining,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) "gK" = (/obj/structure/chair/comfy/brown{dir = 4},/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel/dock) "gL" = (/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/wood,/area/ruin/space/has_grav/hotel/dock) "gM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/wood,/area/ruin/space/has_grav/hotel) @@ -381,12 +381,12 @@ "hx" = (/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = 4},/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = -4},/obj/structure/table,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "hy" = (/obj/structure/table,/obj/item/book/manual/chef_recipes,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar) "hz" = (/turf/open/floor/plasteel/stairs{dir = 4},/area/ruin/space/has_grav/hotel) -"hA" = (/obj/machinery/power/apc/highcap/five_k{dir = 2; name = "Staff Room APC"; pixel_y = -24},/obj/structure/cable{icon_state = "0-4"},/mob/living/simple_animal/bot/medbot{name = "Accidents Happen"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) +"hA" = (/obj/machinery/power/apc/highcap/five_k{dir = 2; name = "Staff Room APC"; pixel_y = -24},/obj/structure/cable{icon_state = "0-4"},/mob/living/simple_animal/bot/medbot{name = "Accidents Happen"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) "hB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window{dir = 8; icon_state = "window"},/obj/structure/window,/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel) -"hC" = (/obj/structure/closet/crate/bin,/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) -"hD" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) +"hC" = (/obj/structure/closet/crate/bin,/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) +"hD" = (/obj/structure/reagent_dispensers/water_cooler,/obj/structure/medkit_cabinet{pixel_x = -1; pixel_y = -28},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) "hE" = (/obj/structure/flora/ausbushes/ywflowers,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel) -"hF" = (/obj/structure/table,/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/regular,/obj/item/storage/firstaid/regular,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) +"hF" = (/obj/structure/medkit_cabinet{pixel_x = -1; pixel_y = -28},/obj/machinery/telecomms/relay/preset/ruskie{use_power = 0},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) "hG" = (/obj/structure/flora/ausbushes/fullgrass,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window,/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel) "hH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window,/obj/structure/window{dir = 4},/obj/structure/flora/ausbushes/lavendergrass,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel) "hI" = (/obj/machinery/door/airlock/maintenance{name = "Hotel Maintenance"; req_access_txt = "200,201"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/bar) @@ -479,10 +479,10 @@ "jt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/closed/wall,/area/ruin/space/has_grav/hotel/pool) "ju" = (/turf/open/floor/plasteel/stairs/left{dir = 8},/area/ruin/space/has_grav/hotel/dock) "jv" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/pool) -"jw" = (/obj/structure/closet/crate{name = "Bluespace Sewing Crate"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) +"jw" = (/obj/structure/closet/crate{name = "Bluespace Sewing Crate"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) "jx" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/closed/wall,/area/ruin/space/has_grav/hotel/pool) "jy" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1},/turf/closed/wall,/area/ruin/space/has_grav/hotel/pool) -"jz" = (/obj/structure/table,/obj/machinery/microwave,/obj/structure/sign/warning/nosmoking/circle{pixel_y = 32},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) +"jz" = (/obj/structure/table,/obj/machinery/microwave,/obj/structure/sign/warning/nosmoking/circle{pixel_y = 32},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) "jA" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high,/obj/item/stock_parts/cell/high,/obj/structure/cable{icon_state = "2-4"},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "jB" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) "jC" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power) @@ -503,7 +503,7 @@ "jR" = (/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/pool) "jS" = (/turf/open/floor/plasteel/white/side{dir = 2},/area/ruin/space/has_grav/hotel/pool) "jT" = (/obj/structure/extinguisher_cabinet{pixel_y = 30},/obj/structure/flora/ausbushes/brflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool) -"jU" = (/obj/structure/table,/obj/item/storage/box/donkpockets,/obj/structure/noticeboard{pixel_y = 32},/obj/item/paper/fluff/ruins/spacehotel/notice,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) +"jU" = (/obj/structure/table,/obj/item/storage/box/donkpockets,/obj/structure/noticeboard{pixel_y = 32},/obj/item/paper/fluff/ruins/spacehotel/notice,/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) "jV" = (/obj/effect/mob_spawn/human/hotel_staff,/obj/effect/turf_decal/stripes/line,/obj/structure/window{dir = 8; icon_state = "window"},/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/workroom) "jW" = (/obj/effect/mob_spawn/human/hotel_staff,/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/workroom) "jX" = (/obj/effect/mob_spawn/human/hotel_staff,/obj/effect/turf_decal/stripes/line,/obj/structure/window{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/workroom) @@ -570,7 +570,7 @@ "lh" = (/turf/open/floor/plasteel/white/side{dir = 8},/area/ruin/space/has_grav/hotel/pool) "lj" = (/obj/machinery/pool/filter{pixel_y = 15},/turf/open/pool,/area/ruin/space/has_grav/hotel/pool) "lk" = (/obj/structure/window/reinforced/fulltile,/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel/dock) -"ll" = (/obj/structure/table,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/crowbar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/workroom) +"ll" = (/obj/structure/table,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/card/id/away/hotel,/obj/item/crowbar,/obj/structure/medkit_cabinet{pixel_x = -1; pixel_y = -28},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/workroom) "lm" = (/obj/machinery/shower{dir = 4},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool) "ln" = (/obj/structure/mirror{pixel_y = 32},/obj/structure/sink{pixel_y = 24},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool) "lo" = (/obj/structure/closet/secure_closet/personal,/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool) @@ -655,7 +655,7 @@ "mS" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel) "mT" = (/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel) "mU" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/carpet,/area/ruin/space/has_grav/hotel) -"mV" = (/obj/machinery/door/airlock{dir = 4; name = "Theatre"; req_access_txt = "200"},/turf/open/floor/plasteel/grimy,/area/ruin/space/has_grav/hotel/bar) +"mV" = (/obj/machinery/door/airlock{dir = 4; name = "Theatre"; req_access_txt = "200"},/obj/machinery/door/firedoor,/turf/open/floor/plasteel/grimy,/area/ruin/space/has_grav/hotel/bar) "mW" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/wood,/area/ruin/space/has_grav/hotel) "mX" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/hotel) "mY" = (/obj/machinery/door/airlock{dir = 4; name = "Bar"; req_access_txt = "200"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/bar) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 28095dc3c0..a42cc3f998 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -3319,7 +3319,7 @@ "bna" = (/obj/machinery/light{dir = 8},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/jukebox,/turf/open/floor/carpet/black,/area/service/bar) "bnb" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/carpet/black,/area/service/bar) "bnc" = (/obj/item/ashtray,/obj/structure/table/plasmaglass,/turf/open/floor/carpet/black,/area/service/bar) -"bnd" = (/obj/structure/table/plasmaglass,/turf/open/floor/carpet/black,/area/service/bar) +"bnd" = (/obj/structure/table/plasmaglass,/obj/item/toy/plush/gs13/gatito{pixel_x = 0; pixel_y = 4},/turf/open/floor/carpet/black,/area/service/bar) "bne" = (/turf/open/floor/carpet/black,/area/service/bar) "bnf" = (/obj/structure/chair/comfy/black{dir = 4},/turf/open/floor/carpet/black,/area/service/bar) "bng" = (/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = -4; pixel_y = 6},/obj/structure/table/plasmaglass,/obj/item/ashtray,/turf/open/floor/carpet/black,/area/service/bar) @@ -7802,7 +7802,7 @@ "xiB" = (/obj/effect/landmark/start/warden,/turf/open/floor/plasteel/showroomfloor,/area/security/warden) "xkX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/catwalk_floor,/area/maintenance/department/medical/morgue) "xlw" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/landmark/start/prisoner,/obj/machinery/button/door{id = "permacells1"; name = "Privacy Shutters"; pixel_x = 25},/obj/item/book/manual/prisoner_SOP,/turf/open/floor/plasteel/dark,/area/security/prison/cells) -"xme" = (/obj/structure/closet/secure_closet/personal,/turf/open/floor/carpet/gato,/area/commons/dorms) +"xme" = (/obj/structure/closet/secure_closet/personal,/obj/item/toy/plush/gs13/gatito{pixel_x = 0; pixel_y = 4},/turf/open/floor/carpet/gato,/area/commons/dorms) "xmo" = (/obj/structure/sign/plaques/golden{pixel_y = 32},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/ai_monitored/security/armory) "xnZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/medical/glass{name = "Prison Forestry"; dir = 4},/turf/open/floor/plasteel/dark,/area/security/prison/upper) "xov" = (/obj/machinery/light{dir = 4},/turf/open/floor/grass,/area/security/courtroom) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f77267d578..ad422d3161 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -84136,6 +84136,14 @@ }, /turf/open/floor/plating/asteroid/airless, /area/space/nearstation) +"sqo" = ( +/obj/structure/dresser, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 15 + }, +/turf/open/floor/wood, +/area/commons/locker) "sqP" = ( /obj/effect/turf_decal/vg_decals/atmos/oxygen, /turf/open/floor/engine/o2{ @@ -105571,7 +105579,7 @@ bxO bxQ bzg lbJ -bLu +sqo bUa beo lbJ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 5b989bbf74..22177b6883 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5299,11 +5299,6 @@ /turf/open/floor/carpet, /area/maintenance/fore) "arG" = ( -/obj/machinery/light/small{ - dir = 1; - pixel_x = -8; - pixel_y = 12 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, @@ -14654,7 +14649,11 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/closed/wall, +/obj/machinery/door/airlock{ + name = "Theatre Backstage"; + req_access_txt = "46" + }, +/turf/open/floor/wood, /area/commons/fitness/recreation) "bfL" = ( /obj/structure/dresser, @@ -46378,6 +46377,11 @@ pixel_x = -26 }, /obj/machinery/vending/autodrobe, +/obj/machinery/light/small{ + dir = 1; + pixel_x = -8; + pixel_y = 12 + }, /turf/open/floor/wood, /area/service/theater) "dhx" = ( @@ -66981,6 +66985,11 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/light/small{ + dir = 1; + pixel_x = -8; + pixel_y = 12 + }, /turf/open/floor/wood, /area/service/theater) "nBX" = ( @@ -81410,7 +81419,10 @@ pixel_x = 29; pixel_y = 1 }, -/obj/item/paper, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/carpet/gato, /area/commons/dorms) "vqN" = ( @@ -84987,9 +84999,9 @@ /area/service/hydroponics/garden) "xgL" = ( /obj/structure/table/wood, -/obj/item/toy/plush/carpplushie{ - color = "red"; - name = "GATO wildlife department space carp plushie" +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 }, /turf/open/floor/carpet, /area/command/corporate_showroom) diff --git a/_maps/map_files/Mining/Lavaland_Demone.dmm b/_maps/map_files/Mining/Lavaland_Demone.dmm index c34d018065..56ab9de609 100644 --- a/_maps/map_files/Mining/Lavaland_Demone.dmm +++ b/_maps/map_files/Mining/Lavaland_Demone.dmm @@ -39,7 +39,7 @@ "bu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/carpet/gato,/area/lavaland/demone/living) "bv" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plating/lavaland_baseturf,/area/lavaland/surface/outdoors) "by" = (/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 8},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby) -"bz" = (/obj/structure/chair/brass{dir = 8},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) +"bz" = (/obj/structure/chair/brass{dir = 8},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "bA" = (/turf/open/floor/carpet/gato,/area/ruin/powered/candyland) "bB" = (/obj/machinery/conveyor{dir = 4; id = "donut"},/obj/item/reagent_containers/food/snacks/donut/matcha{desc = "Are you sure you want to eat this?"; name = "Demon puke donut"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factory) "bJ" = (/obj/item/reagent_containers/food/snacks/burger/red,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) @@ -127,6 +127,7 @@ "fd" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel,/area/lavaland/demone/minestorage) "fl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 9},/turf/open/floor/wood,/area/lavaland/demone/demonevillage) "fs" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen) +"fv" = (/obj/structure/chair/brass{dir = 4},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "fw" = (/obj/structure/table/reinforced/brass,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "fz" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/lavaland/demone/living) "fB" = (/obj/structure/chair/bench/left{dir = 8},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) @@ -224,6 +225,7 @@ "jT" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "jW" = (/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice) "jY" = (/obj/effect/turf_decal/tile/purple{dir = 8},/obj/effect/turf_decal/tile/purple,/turf/open/candyfloor,/area/ruin/powered/candyland) +"jZ" = (/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "ka" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 5},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "ke" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "kf" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) @@ -235,6 +237,7 @@ "kt" = (/obj/structure/closet/crate/bin,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel,/area/lavaland/demone/reception) "ku" = (/obj/structure/chair/wood{dir = 1},/turf/open/floor/carpet/black,/area/lavaland/demone/factoryoffice) "kw" = (/obj/structure/chair/sofachair{dir = 1},/turf/open/floor/carpet,/area/lavaland/demone/reception) +"kx" = (/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/factory) "kz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/chair/wood/normal{dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/reception) "kE" = (/obj/structure/table,/turf/open/floor/wood,/area/lavaland/demone/demonevillage) "kG" = (/obj/structure/stone_tile/surrounding_tile/cracked{dir = 1},/turf/open/chasm/lavaland,/area/lavaland/surface/outdoors) @@ -423,7 +426,7 @@ "sp" = (/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby) "sq" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel,/area/lavaland/demone/factorygen) "ss" = (/obj/item/stack/spacecash/c10,/obj/structure/table/wood,/obj/item/stack/spacecash/c10{pixel_y = 6},/obj/item/stack/spacecash/c10{pixel_y = 12},/turf/open/indestructible/chocolate,/area/ruin/powered/candyland) -"su" = (/obj/structure/chair/brass{dir = 1},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast{name = "Cream Demon"},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) +"su" = (/obj/structure/chair/brass{dir = 1},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast/cream_demon,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "sD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage) "sE" = (/obj/structure/stone_tile/slab/cracked{dir = 8},/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors) "sH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) @@ -454,6 +457,7 @@ "tE" = (/obj/structure/flora/ausbushes/sunnybush,/mob/living/simple_animal/butterfly,/turf/open/floor/grass,/area/lavaland/demone/living) "tF" = (/obj/item/gun/magic/wand/food,/turf/open/chocolateriver,/area/ruin/powered/candyland) "tH" = (/obj/machinery/airalarm/unlocked{pixel_y = -24; dir = 1},/turf/open/floor/wood,/area/lavaland/demone/demonevillage) +"tI" = (/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/line{dir = 1},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "tN" = (/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/obj/item/reagent_containers/food/snacks/chocolatebar,/turf/open/candyfloor,/area/ruin/powered/candyland) "tO" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/lavaland/demone/factorygen) "tP" = (/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/corner,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) @@ -533,6 +537,7 @@ "wQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "wS" = (/obj/structure/sign/poster/official/fruit_bowl,/turf/closed/wall/mineral/iron,/area/lavaland/demone/factoryoffice) "wX" = (/obj/structure/chair/wood,/obj/item/reagent_containers/food/snacks/chococoin{pixel_y = -9; pixel_x = -12},/turf/open/indestructible/chocolate,/area/ruin/powered/candyland) +"wY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "wZ" = (/obj/structure/stone_tile/slab/cracked{dir = 9},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "xd" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/structure/cable{icon_state = "1-4"},/obj/structure/cable{icon_state = "1-8"},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals5"},/turf/open/floor/plasteel,/area/lavaland/demone/factorystorage) "xg" = (/obj/machinery/conveyor{dir = 8; id = "donut"},/obj/item/reagent_containers/food/snacks/donut/matcha{desc = "Are you sure you want to eat this?"; name = "Demon puke donut"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factory) @@ -556,6 +561,7 @@ "yh" = (/obj/item/reagent_containers/food/snacks/candyheart,/turf/open/candyfloor,/area/ruin/powered/candyland) "yl" = (/obj/structure/sign/nanotrasen,/turf/closed/wall/mineral/iron,/area/lavaland/demone/factoryoffice) "ym" = (/obj/structure/grille,/obj/structure/window/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plating,/area/lavaland/demone/tele) +"yo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/factory) "yp" = (/obj/structure/closet/secure_closet/freezer/kitchen,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/obj/item/reagent_containers/food/snacks/rationpack,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen) "yr" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light{dir = 1},/turf/open/floor/wood,/area/lavaland/demone/demonevillage) "yt" = (/obj/machinery/conveyor{id = "donut"},/obj/machinery/door/poddoor{id = "Donut2"},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage) @@ -567,6 +573,7 @@ "yI" = (/turf/closed/wall/mineral/iron,/area/lavaland/surface/outdoors) "yO" = (/obj/structure/stone_tile/surrounding_tile{dir = 8},/obj/structure/stone_tile/slab/cracked{dir = 8},/obj/item/flashlight/lantern{icon_state = "lantern-on"; on = 1},/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors) "yP" = (/obj/structure/stone_tile/block/burnt{dir = 8},/turf/open/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors) +"yQ" = (/obj/structure/spawner/candy/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "yR" = (/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/plating,/area/lavaland/demone/living) "yS" = (/obj/structure/closet/crate{name = "crate full of plasma"},/obj/item/wrench,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "yT" = (/obj/structure/table/wood,/obj/item/trash/plate,/obj/item/reagent_containers/food/snacks/bun{pixel_y = 3; pixel_x = 1},/obj/item/reagent_containers/food/drinks/mug{pixel_y = 5; pixel_x = 13},/turf/open/floor/plasteel/grimy,/area/lavaland/demone/reception) @@ -627,6 +634,7 @@ "By" = (/turf/open/indestructible/chocolate{icon_state = "choclit_4"},/area/ruin/powered/candyland) "BA" = (/obj/structure/stone_tile/surrounding_tile/cracked{dir = 1},/turf/open/indestructible/necropolis,/area/lavaland/surface/outdoors) "BB" = (/obj/item/shovel,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"BD" = (/obj/structure/chair/brass{dir = 8},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "BE" = (/obj/machinery/light{dir = 8},/turf/open/floor/plating,/area/lavaland/demone/villagesilo) "BF" = (/obj/structure/table/glass,/obj/item/ashtray{name = "candle holder"},/turf/open/floor/carpet,/area/lavaland/demone/reception) "BG" = (/obj/structure/stone_tile/block/cracked{dir = 1},/obj/structure/stone_tile/block/cracked{dir = 4},/turf/open/chasm/lavaland,/area/lavaland/surface/outdoors) @@ -719,12 +727,14 @@ "Fv" = (/obj/item/toy/plush/lizardplushie/kobold,/turf/open/floor/wood,/area/lavaland/demone/demonevillage) "Fw" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/lavaland/demone/living) "Fy" = (/obj/structure/mineral_door/iron,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage) +"Fz" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast/cream_demon,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/factory) "FB" = (/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/minestorage) "FE" = (/obj/effect/turf_decal/stripes/line{dir = 2},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals5"},/turf/open/floor/plasteel,/area/lavaland/demone/factorystorage) "FH" = (/obj/structure/cable{icon_state = "2-8"},/obj/structure/cable{icon_state = "1-2"},/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 1},/turf/open/floor/plasteel/dark/side,/area/lavaland/demone/tele) "FJ" = (/obj/machinery/light{dir = 8},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/stripes/line{dir = 1},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "FP" = (/turf/open/floor/wood{icon_state = "wood-broken3"},/area/lavaland/surface/outdoors) "FQ" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/light{dir = 8},/turf/open/floor/carpet/gato,/area/lavaland/demone/living) +"FU" = (/obj/structure/spawner/candy/chocoslime,/turf/open/indestructible/chocolate,/area/ruin/powered/candyland) "FV" = (/obj/item/reagent_containers/food/snacks/chocoorange{pixel_y = -12; pixel_x = -10},/turf/open/indestructible/chocolate{icon_state = "choclit_3"},/area/ruin/powered/candyland) "FX" = (/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plating/lavaland_baseturf,/area/lavaland/surface/outdoors) "FY" = (/turf/closed/indestructible/candy,/area/lavaland/surface/outdoors) @@ -827,7 +837,7 @@ "Kw" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{dir = 4},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice) "Kx" = (/obj/structure/table/reinforced,/obj/machinery/reagentgrinder,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen) "KA" = (/obj/effect/turf_decal/bot,/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage) -"KE" = (/obj/structure/chair/brass{dir = 4},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) +"KE" = (/obj/structure/chair/brass{dir = 4},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "KG" = (/obj/machinery/light{dir = 1},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/demone/lobby) "KI" = (/obj/machinery/door/airlock/survival_pod/glass,/obj/machinery/poweredfans,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage) "KK" = (/obj/machinery/light{dir = 1},/obj/structure/closet/crate,/obj/item/reagent_containers/food/snacks/donut/berry{desc = "Straight from lavaland!"; name = "Hella Donut"},/obj/item/reagent_containers/food/snacks/donut/berry{desc = "Straight from lavaland!"; name = "Hella Donut"},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage) @@ -1304,7 +1314,7 @@ krkrkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCenenenenenenenenenenrKDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrenDCDCVgdbLdlbBGkGyXQDlblbsEhrVgDCDCDCDCDCenenkrkrkrkrkrkrenDCDCDCDCtQvNxxtvqdiKacxxXRtQDCDCDCenkrkrkrkrenenenenenenkrkrkrkrDCDCenenenDCDCDCkrkrkrkrkrkrkrDCkrkrenBVenenenenenenenenenenenDCenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYFYDCDCDCDCDCxBxBxBxBqOqOqOxBxBxBxBFYFYDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCenenenenenenenenDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrenDCDCVguQsEMRAJBGZQuPlblbUAjgVgDCDCDCDCDCenenkrkrkrkrkrenenDCDCDCDCtQQvETETVTKSETETFZtQDCDCDCenenenenenenenenenBVenenkrkrkrkrDCenenenDCDCDCkrkrkrkrkrkrkrDCkrenenenenenenenenenenenenDCenDCenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCDCDCFYFYFYFYFYDCDCDCFYxBxBxBggggggggggggggggxBxBFYDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCMKMKMKPzMKMKMKDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkrenDCVgLHWBsElbXCpjbilbUAjgVgVgDCDCDCDCDCcXenenkrkrkrenenDCDCDCDCDCtQMsEXEXvXnuuREXMdtQDCDCDCozencXenenenenenenenenenenkrkrkrkrenenenDCDCDCkrkrkrkrkrkrkrDCkrenenenenenenenenenenenDCDCrzDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYDCDCDCDCDCFYFYFYFYFYDCDCDCFYxBxBggggIFiRIFIFByVOggggxBxBFYDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCcXenenenenenenencXDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkrenDCVgVgpPZLmdlbVvYFlbmTVgVgDCDCDCDCDCDCDCcXenenkrenenDCDCDCDCDCDCtQDKEXEXvXEXEXEXeGtQtQtQtQtQBErzenenenenenenenenenenenkrkrenenenenDCDCDCkrkrkrkrkrDCkrDCenenenenenenenenenenenenDCDCDCDCenenenkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYDCDCDCDCDCDCFYFYFYDCDCFYFYxBxBxBggmOIFQosdeDqnIFguggxBxBFYFYDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCcXenenenenenenencXDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkrenDCVgVgpPZLmdlbVvYFlbmTVgVgDCDCDCDCDCDCDCcXenenkrenenDCDCDCDCDCDCtQDKEXEXvXEXEXEXeGtQtQtQtQtQBErzenenenenenenenenenenenkrkrenenenenDCDCDCkrkrkrkrkrDCkrDCenenenenenenenenenenenenDCDCDCDCenenenkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYDCDCDCDCDCDCFYFYFYDCDCFYFYxBxBxBggmOIFQosdeDqnFUguggxBxBFYFYDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCenenenenenenenenenenDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCVgVgLHRdRdglRdZLNNDCDCDCDCDCDCDCDCDCDCenenenenDCDCDCDCDCDCDCtQlEsJHhVJLVLVLVJuHjxxxxxxikgvenenenenenenenenenenenenenenenenenenenDCDCkrkrkrkrkrDCDCDCcXenenenenenenenenenenenDCDCDCDCenenenkrkrenDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYFYFYFYDCFYFYDCDCDCDCDCDCDCFYFYFYFYFYFYxBxBxBxBxBByuoeDeDeDYLnWIFggxBxBxBDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCeneneneneneneneniqenDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCVgVgVgVgVgVgYulblblbenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCtQtQtQtQtQtQtQtQtQtQtQtQtQtQBEenenidenenenenenenenenenenenenenenenenDCDCkrkrkrkrkrDCDCDCenenDCenenenenenenenenenDCDCDCDCenBVenkrkrenenDCDCDCDCDCDCDCDCDCFYFYFYFYFYFYFYFYFYFYFYFYFYFYDCDCDCFYFYFYFYFYxBxBxBxBxBxBxBxBxBxBeDvCeDWGiRIFggxBxBxBFYFYDCDCDCenenenkrkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCiqenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDClbenenenenkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenLbenenenenenenenenenenenenenenenDCDCDCkrkrkrkrDCDCDCenDCDCenenenenenenenenenDCDCDCcXenenenkrkrDCDCDCDCDCDCDCDCDCDCFYFYFYxBxBxBxBxBxBxBxBxBxBFYFYFYFYFYxBxBxBxBxBxBxBxBxBxBxBpIApwKxBeDeDeDFVIFByggxBxBFYDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkrkr @@ -1313,8 +1323,8 @@ krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCrKenenenenenenenenencXenDCDCDCDCDCDCenkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrenenenenFdDCDCDCDCDCDCDCDCDCDCFdrrDCDCDCDCDCDCDCDCDCDCrzenenenenenenenenenenenenenenenenenenenenenDCDCkrkrenenDCenenenenenenenenenenenenenenenDCDCenkrkrkrkrkrkrenDCDCDCDCDCDCDCFYFYxBggggIFsnEnJhIFnWJhJhggggxBxBxBxBdZdZNjUsoWdZdZxBxBxBpIyhoteDoteDCKpIwmxBxBxBxBFYFYFYFYDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCeniqenenenencXenenenenenDCDCDCDCDCenkrkrkrkrkrkrenencXDCDCDCDCDCDCDCDCDCrrenenenenenenkrkrkrkrenenenenenenrzDCDCDCDCiqenenenenenenenrrenDCenenenenenenenenenenenenenenenenenenenenenenenenenenrzDCkrenencXenenenenenenenLbenenenenenenenenDCDCenkrkrkrenenenenDCDCDCDCDCDCDCFYFYxBggIFIFIFeDeDeDeDIFiRIFIFxBxBxBxBdZKEnEWhJEbzdZxBxBxBpIApIFdtJhIFApdZdZtNxBxBxBFYFYFYFYDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCrzenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrkrenenenenDCDCDCDCDCDCDCFdenenenenenenVgQWQWQWQWQWVgenenenenenenenrrenenenBVenenenenenenenFdeneneneneneneneneneneneneneneneneneneneneneneneneneneniqenenenenenenenenenenenenenenenenenenenenenDCenkrkrenenDCDCDCDCDCDCDCDCDCFYFYxBxBggIFMJeDeDeDeDeDeDhnJhiRxBxBxBxBOaKEqZtFRqbzmFxBxBxBApApJhIFIFIFApApdZdZyhxBxBxBFYFYFYDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenrKDCDCDCDCDCenkrkrkrkrkrenenenenLbFdDCDCDCDCenenenenenenenenMpDPCCJNCCDPMpenenenenenenenenenenenenenenenenenenenenenenenenzEenenrzDCDCDCDCDCFdenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenDCDCDCDCDCDCDCDCDCDCFYxBxBxBggJhiReDeDIFIFeDeDeDIFxBxBxBxBxBdZKERXLnUGbzdZxBxBxBoPeDoteDotApINApApdZdZxBxBxBxBFYFYDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCcXenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrenBVenenenidDCDCDCDCenenenenenDCenenVgDoDoDoDoDoVgenenenFdenenenenenenenenenenenenzEDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenZJUQlqenenenenenenenenenenenenenenenenenenenkJkJenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCFYxBxBxBggIFIFeDeDhauWOxeDeDxBxBpIyhxBxBdZdZdZdZdZdZdZxBxBZxaYoteDeDApApApHgApdZdZxBxBxBxBxBFYFYDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenrKDCDCDCDCDCenkrkrkrkrkrenenenenLbFdDCDCDCDCenenenenenenenenMpDPCCJNCCDPMpenenenenenenenenenenenenenenenenenenenenenenenenzEenenrzDCDCDCDCDCFdenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenDCDCDCDCDCDCDCDCDCDCFYxBxBxBggJhiReDeDFUIFeDeDeDIFxBxBxBxBxBdZfvRXLnUGBDdZxBxBxBoPeDoteDotApINApApdZdZxBxBxBxBFYFYDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCcXenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrenBVenenenidDCDCDCDCenenenenenDCenenVgDoDoDoDoDoVgenenenFdenenenenenenenenenenenenzEDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenZJUQlqenenenenenenenenenenenenenenenenenenenkJkJenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCFYxBxBxBggIFIFeDeDhauWOxeDeDxBxBpIyhxBxBdZdZdZyQdZdZdZxBxBZxaYoteDeDApApApHgApdZdZxBxBxBxBxBFYFYDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrenenenDCenenDCDCrrDCenenenenDCDCenenenenkrkrkrkrenenenrzDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkJkJenenenenenenenenenenidDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCFYFYxBxBggIFnWeDeDeDIFIFIFeDeDLjApHgxBxBxBUMdZdZdZfwxBxBxBpIeDeDotjRwmxBxBxBApApJBdZwmpIxBxBxBFYDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCeneneneneneneneneneneneneniqDCDCDCDCenkrkrkrenenDCDCDCenenDCenFdenenenDCDCDCDCenenenkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYxBggggJhIFeDeDeDeDeDoteDeDjRAppIxBxBipdZdZdZfwxBxBwKoteDoteDApxBxBxBxBxByhApApdZzwxBxBxBFYDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenDCDCDCenkrkrkrenenDCDCDCDCenDCenenenLbDCDCDCDCDCDCenenkrkrkrkrenenDCDCDCiqDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenDCDCDCDCDCDCDCDCrrenenenenenenenenenenenenenDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYxBxBggggIFIFxBxBxBoteDeDoteDINXFpIxBxBxBdZxBxBxBpIApeDeDotApxBxBdZMHepxBxBApdZdZyhxBxBxBxBFYDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr @@ -1373,17 +1383,17 @@ krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDC krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCenkrkrenkrenenkrenkrkrkrenkrkrkrDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCenenenenDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrenenenDCDCDCDCDCDCenDCDCDCDCDCenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkreneneneneneneFDCDCDCDCDCDCDCDCDCljNFOgAwfRQZYrDTcHdNBcljDCDCDCDCDCDCDCrzenenenenenenenenenDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCcXenenenenenDCDCDCDCDCDCDCDCkrkrenkrkrenenenenkrkrkrenkrkrkrDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCenenenenenDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCrzenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkreneneneneneFIgIgIgIgIgIgIgIgIgIgIgljljljljljljljljljEOljljIgIgIgIgIgIgDCenenenenenenenenenenenenDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrDCDCDCDCkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCkrkrkrenkrenenrrenenkrkrenenkrkrDCDCDCDCDCDCDCenenenenenenenenenDCDCenDCDCenenenenenDCDCkrkrkrkrkrkrkrkrkrenkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenrrenenenenenenenenenDCDCDCDCDCDCenenenenenenenenenenenkrkrkrkrkrkrkrkrkrenenenenenenIgIglLEDzpHCzpzplLzptPnrsSzpIYzpzpzpOPSyYpHnlLzpzpzplLSeAvIgIgenenenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCkrkrkrenenenencXenenkrkrkrenkrkrkrDCDCDCDCDCDCaOenenenenenenenenenDCenDCenenenenenrzDCDCkrkrkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenrrDCDCDCDCenkrkrkrkrkrenDCenenkrkrkrkrkrkrkrkrkrkrkrenenenenDqwQvSLLLLLLLLdPLLLLLLLLCWSOPyLLLLLLLLulLLLLLLhPerererrTChzpxKbqIgrzrrenenenenenenBVenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCkrkrkrenenenencXenenkrkrkrenkrkrkrDCDCDCDCDCDCaOenenenenenenenenenDCenDCenenenenenrzDCDCkrkrkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenrrDCDCDCDCenkrkrkrkrkrenDCenenkrkrkrkrkrkrkrkrkrkrkrenenenenDqwQvSLLLLLLLLdPLLLLLLLLCWSOPyLLLLLLLLulLLLLLLhPerererrTChzpxKbqIgrzrrenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrDCDCkrkrenenkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCenenenenenenrrDCDCDCDCDCDCDCkrkrkrkrkrenenencXenenkrenenkrkrkrkrDCDCDCDCDCenenenenenenenenenenDCenenenenenenenenDCDCkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCeneneneneneneneneniqDCDCenkrkrkrkrkrkrenDCenDCenkrkrkrkrkrkrkrkrkrkrenenenenenenIgzpzptPnrnrnrnrnrnrqxPkyvnrnrnrnrfKnrnrnruiHoRkSyLDSyrnkeIgIgIgoienenenenenendBenenkrkrkrkrDCDCDCDCkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrDCDCkrkrkrenkrkrkrkrenkrkrkrkrkrDCDCDCDCDCDCDCDCDCrKenenenenenenenDCDCDCDCDCDCDCkrkrkrkrkrenenenencXenenkrkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenenenenenenrzDCDCkrkrkrkrkrkrkrenenenenkrkrkrkrkrkrkrkrkrenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCkrkrkrkrkrkrenDCDCDCenkrkrkrkrkrkrkrkrkrkrenenenenenDNIgEDzpaJNqPnPnPnhyPnxgiYPoPnhyPnhyoYPnPnhyxgPngBzpanzpkfzpzpNzenenenenenenenenenenkrkrkrkrkrDCDCDCDCkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrDCDCkrkrkrkrkrkrkrenenrzkrkrkrkrkrDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCDCDCkrkrkrkrkrenenenenenenkrkrkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenenenenenrzDCDCDCkrkrkrkrkrkrenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrkrkrenenenenenDNIgzpSVOnPoGnCICICICICIIdPoQSScScScVDScScScScScvZzpanzpkfzpzpCsenenenenenenenenenenkrkrkrkrkrkrDCDCkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrDCkrkrkrkrkrkrkrenenenenenkrkrkrkrDCDCDCDCDCDCenzVenenenenenenenenrzDCDCDCDCDCDCkrkrkrkrkrenenenenenenenenkrkrkrkrkrkrDCDCDCDCDCenenenenenenenenenenenenenenenenrrDCDCDCkrkrkrkrkrkrenenenenenenkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenDCDCDCDCDCDCDCDCenenenenenenenenenenDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrkrkrenenenenenDNIgzpNxokPoczxmNYNYPnPnhyiYhfzpdCzpRserjAIXjAjAIXjAueddTRkeIgIgIgoienenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenenenkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenenenenDCDCDCDCkrkrkrkrenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCenenrrenenenenenenrrenrzDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrkrenenenenenenDNIgrxrxbrXKOsXKbrFJScScScScvZkeIgqBoezpexIgRARAIgRARAIgSjxKjiIgrzenenenenenenenenenenELELITELELELELELITELELkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenenenkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenenenenDCDCDCDCkrkrkrkrenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCenenrrenenenenenenrrenrzDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrkrenenenenenenDNIgrxrxbrXKOsXKbrFJScSctIScvZkeIgqBoezpexIgRARAIgRARAIgSjxKjiIgrzenenenenenenenenenenELELITELELELELELITELELkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCkrenkrkrkrkrkrkrenenenkrkrkrkrkrDCDCDCDCDCDCenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenenenkrkrkrkrkrDCDCDCDCDCrzenenenenenenenenenenenenenenDCDCDCDCkrkrkrkrenenenDCenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCiqenenenenenenenenenDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkrkrenenenenenenenDNIgzJzJbrwrFewrOsXyzpEkzpzpzpxKoKXyoezpexwoRARAwoRARAwoSjxKZVIgenrrenenenenenenenenenvvzSvvvvvvvvvvvvvvZYELkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrkrkrenenenenenkrkrkrDCDCDCDCDCDCDCenenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrenenenenenenenkrkrkrkrDCDCDCDCDCenenenDCenenenenenenenenenenenDCDCDCDCkrkrkrenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCrrenenenenenenenDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkreneneneneneneneFeFIgzJNDbrOGFewrbrXyzpzpzpzpzpxKoKXyoezpexbMRARARURARADQSjxKodIgenenenenenenenenenenenSCwhMUPNPNPNPNPNMgvvITkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrkrkrenenenenenkrkrkrDCDCDCDCDCDCDCenenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrenenenenenenenkrkrkrkrDCDCDCDCDCenenenDCenenenenenenenenenenenDCDCDCDCkrkrkrenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCrrenenenenenenenDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkreneneneneneneneFeFIgzJNDbrOGFewrbrXyzpzpzpzpzpxKoKXywYzpFzbMRARARURAkxDQSjxKodIgenenenenenenenenenenenSCwhMUPNPNPNPNPNMgvvITkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrkrenenenenenkrkrkrDCDCDCDCDCDCDCrKenenenenenenenenenenenenenenDCDCDCDCDCDCkrkrkrkrkrkrkrkrenenenenenenkrkrkrkrDCDCDCDCDCDCenDCDCenenenenenenenenenenaODCDCDCDCkrkrkrenenenenenenenenDCenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCiqenenenenDCDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkrkreneneneneneneneneFIgwOzJbrwrFeiNbrXyzpEMerererLSPruumwerUmOuRARAzeRARAOuSjxKalIgAyenenenenenenenenenenenfYTHgLvTvTvTgLdcvvELkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCrzkrkrkrkrenenenenkrkrkrkrDCDCDCDCDCDCDCenenenenenenenenenenenenenenrrenDCDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenkrkrkrkrDCDCDCDCDCenJrDCenenenenenenenenenrzDCDCDCDCDCkrkrkrenenenenenenenenenenkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCenenenDCDCDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkreneneneneneneneneneFIgzJzJbriNFewrOsXyzpzpzpzpzpxKoKXykaLLudAxYeYeUUYeYetlGbxKihIgNeenenenenenenenenenenenwhRJbLDeKOuqbLMXvvELkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrenrzenenkrkrkrDCDCDCDCDCDCDCrzzVenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrenenenenenkrkrkrkrDCDCDCDCDCenenDCenenenenenenenenenrrDCDCDCDCDCkrkrkrkrkrenDCenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCMKPzMKDCDCDCDCDCDCenkrkrkrkrkrenDCDCDCDCenkrkrkrkrkrkrenenenenenenenenenenIgIgrxbrXKOsXKbrqBzpzpzpzpzpkeIgqBzpzpkogARARAgARARAgALcxKkWIgNeenenenenenenenenenenenwhGpeoJJeaJJeodcvvELkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCrzkrkrkrkrenenenenkrkrkrkrDCDCDCDCDCDCDCenenenenenenenenenenenenenenrrenDCDCDCDCDCDCDCkrkrkrkrkrkrkrenenenenenenkrkrkrkrDCDCDCDCDCenJrDCenenenenenenenenenrzDCDCDCDCDCkrkrkrenenenenenenenenenenkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCenenenDCDCDCDCDCDCDCkrkrkrkrkrenDCDCDCDCDCenkrkrkrkrkreneneneneneneneneneFIgzJzJbriNFewrOsXyzpzpzpzpzpxKoKXykaLLudAxyoYeUUYeYetlGbxKihIgNeenenenenenenenenenenenwhRJbLDeKOuqbLMXvvELkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrenrzenenkrkrkrDCDCDCDCDCDCDCrzzVenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrenenenenenkrkrkrkrDCDCDCDCDCenenDCenenenenenenenenenrrDCDCDCDCDCkrkrkrkrkrenDCenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCMKPzMKDCDCDCDCDCDCenkrkrkrkrkrenDCDCDCDCenkrkrkrkrkrkrenenenenenenenenenenIgIgrxbrXKOsXKbrqBzpzpzpjZzpkeIgqBzpzpkogARARAgARARAgALcxKkWIgNeenenenenenenenenenenenwhGpeoJJeaJJeodcvvELkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCenkrkrkrenenenenkrkrDCDCDCDCDCDCDCiqenenenenenenenenenenenzVhIenenenenenenDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrenenenenenkrkrkrDCDCDCDCDCenenDCenenenenenenenrrenDCDCDCDCDCDCkrkrkrkrkrenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCiqeniqDCDCDCDCDCDCenkrkrkrkrkrenDCDCDCDCenkrkrkrkrkrenenenenenenenenenenenIgzJzJIgxmczPooJnrnrnrnrnrsSzppszpzpzpkoIgRARAIgRARAIgLcxKVzIgfBenenenenenenenenenenenwhGpgLJJJJJJgLdcvvELkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrenenkrkrenkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCkrkrkrkrenenenenkrDCDCDCDCDCDCDChIenenenenenenenenenhIenDCDCDCrriqenenenenenDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCenenenenenenenenenenenrzDCDCDCDCDCDCkrkrkrkrkrkrenDCenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCeneneneniqDCDCDCDCDCenkrkrkrkrkrkrenDCDCDCenkrkrkrkrenenenenenenBVenenenenenIgzJAZrxPkczbByxyxCtyxbBPohfzpzpzpzpzpOwuYsHsHuYsHsHuYtUxKwkIgenenenenenenenenenenenenwhRJbLRpXMRNbLMXvvELkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrenDCDCDCkrkrkrkrkrenenkrkrDCDCDCDCDCDCDCenenenenenenenenenANDCDCDCDCDCDCDChIenenenenenaODCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCrzenenenenenenenenenenDCDCDCDCDCDCDCkrkrkrkrkrkrenenenenkrkrkrenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCrrenenenenenDCDCDCDCenenkrkrkrkrkrkrenDCenenkrkrkrkrkrenenenenenenenenenenenenIgAZzJIgPoLgScScvxScSczLPohfJZzpzpzpzpzpJZzpzpJZzpzpJZAIxKEYIgIgoienenenenenenenenenenfYTHgLgLgLgLgLdcvvELkrkrkrkrkrkrkr diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index 0817169087..1098a2eec4 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -5669,7 +5669,10 @@ pixel_y = 23 }, /obj/structure/table/wood, -/obj/item/flashlight/lamp/green, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/carpet/gato, /area/xenoarch/gen) "mz" = ( @@ -10430,6 +10433,10 @@ /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"Ch" = ( +/obj/structure/spawner/candy/creambeast, +/turf/open/candyfloor, +/area/ruin/powered/candyland) "Cj" = ( /obj/structure/table, /turf/open/floor/plasteel, @@ -12084,6 +12091,10 @@ /obj/structure/tree/candylight, /turf/open/candyfloor, /area/ruin/powered/candyland) +"II" = ( +/obj/structure/spawner/candy/chocoslime, +/turf/open/indestructible/bubblegum, +/area/ruin/powered/candyland) "IJ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -13293,6 +13304,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, +/obj/item/toy/plush/gs13/gatito, /turf/open/indestructible/hotelwood, /area/xenoarch/gen) "MP" = ( @@ -15170,6 +15182,10 @@ }, /turf/open/floor/plating, /area/xenoarch/caloriteresearch_powered) +"TG" = ( +/obj/structure/spawner/candy/chocoslime, +/turf/open/candyfloor, +/area/ruin/powered/candyland) "TH" = ( /turf/open/floor/pod, /area/xenoarch/caloriteresearch_powered) @@ -16198,6 +16214,10 @@ }, /turf/open/floor/plating, /area/xenoarch/arch) +"Xz" = ( +/obj/structure/spawner/candy/creamdemon, +/turf/open/candyfloor, +/area/ruin/powered/candyland) "XA" = ( /obj/item/trash/can, /turf/open/floor/plasteel/freezer, @@ -16304,6 +16324,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/xenoarch/caloriteresearch_powered) +"XM" = ( +/obj/structure/spawner/candy/magehand, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "XQ" = ( /obj/structure/table/reinforced/brass, /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit{ @@ -60378,7 +60402,7 @@ jY lQ lQ lQ -Td +lQ BP lQ lQ @@ -63726,7 +63750,7 @@ lQ lQ lQ lQ -lQ +XM lQ lQ lQ @@ -64634,7 +64658,7 @@ Za DE Ad Ad -IH +Ch WT WT DE @@ -65913,7 +65937,7 @@ DE Za Rz DE -IH +TG xm xm We @@ -67448,7 +67472,7 @@ WT Fb Za KI -IH +WT WT Kc uD @@ -68222,7 +68246,7 @@ Za Za rE DE -Rc +II Rc DE DE @@ -68480,7 +68504,7 @@ Za Za DE TB -Zl +Rc Rc DE Za @@ -68747,7 +68771,7 @@ WT uD WT WT -IH +Xz DE Za Za diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 80c81de414..a102a38c04 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -34210,12 +34210,12 @@ /turf/open/floor/wood, /area/commons/fitness/recreation) "bsi" = ( -/obj/structure/chair/sofa/corner{ - dir = 1 - }, /obj/structure/sign/poster/official/random{ pixel_x = -32 }, +/obj/structure/chair/sofa/corner{ + dir = 4 + }, /turf/open/floor/carpet, /area/commons/fitness/recreation) "bsj" = ( @@ -34225,6 +34225,10 @@ name = "drain" }, /obj/structure/chair/sofa/left, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 4 + }, /turf/open/floor/carpet, /area/commons/fitness/recreation) "bsk" = ( @@ -57301,6 +57305,14 @@ }, /turf/open/floor/plasteel/dark, /area/science/explab) +"gEo" = ( +/obj/structure/chair/comfy/black, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 4 + }, +/turf/open/floor/plasteel/dark, +/area/command/bridge) "gFh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, @@ -96390,7 +96402,7 @@ aqJ arK aiM atT -auR +gEo avV axb ayb diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index df32e50096..f4ba8ae8a2 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -3407,6 +3407,10 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/table, /obj/machinery/light, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/plasteel, /area/centcom/control) "cGI" = ( @@ -12860,6 +12864,10 @@ name = "drain" }, /obj/structure/chair/sofa, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/carpet/black, /area/centcom/ferry) "jJT" = ( @@ -21622,11 +21630,14 @@ /area/centcom/ferry) "qbp" = ( /obj/structure/table/wood, -/obj/item/storage/dice, /obj/machinery/light, /obj/structure/sign/poster/official/gato_logo{ pixel_y = -32 }, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/carpet/gato, /area/centcom/evac) "qbS" = ( @@ -29334,6 +29345,10 @@ name = "CentCom Customs"; req_access_txt = "109" }, +/obj/item/toy/plush/gs13/gatito{ + pixel_x = 0; + pixel_y = 7 + }, /turf/open/floor/plasteel, /area/centcom/evac) "vPo" = ( diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 0577bd8f9f..1b376b6144 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -48,7 +48,7 @@ name = "poster" var/original_name desc = "A large piece of space-resistant printed paper." - icon = 'icons/obj/contraband.dmi' + icon = 'GainStation13/icons/obj/contraband.dmi' //GS13 - gato posters plane = ABOVE_WALL_PLANE anchored = TRUE buildable_sign = FALSE //Cannot be unwrenched from a wall. diff --git a/tgstation.dme b/tgstation.dme index c96b3ee69e..6f85efb10e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3983,6 +3983,7 @@ #include "GainStation13\code\game\objects\structures\medikit.dm" #include "GainStation13\code\game\objects\structures\sofa.dm" #include "GainStation13\code\game\objects\structures\statues.dm" +#include "GainStation13\code\game\objects\structures\spawner.dm" #include "GainStation13\code\game\objects\structures\table_frames.dm" #include "GainStation13\code\game\objects\structures\table_racks.dm" #include "GainStation13\code\game\objects\structures\beds_chairs\bed.dm"