From 56f9fbe5123ebc3f4beb7e2453dc45cd66ccd542 Mon Sep 17 00:00:00 2001 From: Masenod <64508955+Masenod@users.noreply.github.com> Date: Sat, 29 Apr 2023 14:24:33 -0700 Subject: [PATCH 1/3] Implement Strong Legs trait and fix capitalization of Weak Legs --- code/__DEFINES/mobs.dm | 1 + code/__DEFINES/traits.dm | 1 + .../controllers/subsystem/processing/quirks.dm | 3 ++- code/datums/traits/good.dm | 18 +++++++++--------- code/datums/traits/neutral.dm | 2 +- .../modules/mob/living/carbon/human/species.dm | 3 +++ 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 05fe0e6a..2c35c147 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -171,6 +171,7 @@ #define FATNESS_DIVISOR 860 #define FATNESS_MAX_MOVE_PENALTY 4 #define FATNESS_WEAKLEGS_MODIFIER 20 +#define FATNESS_STRONGLEGS_MODIFIER 0.5 //Nutrition levels for humans #define NUTRITION_LEVEL_FULL 550 diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index b9ddd659..a977e3ad 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -116,6 +116,7 @@ #define TRAIT_JOLLY "jolly" #define TRAIT_HEADPAT_SLUT "headpat_slut" #define TRAIT_WEAKLEGS "weak_legs" +#define TRAIT_STRONGLEGS "strong_legs" #define TRAIT_NOCRITDAMAGE "no_crit" #define TRAIT_NOSLIPWATER "noslip_water" #define TRAIT_NOSLIPALL "noslip_all" diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index ec8afaa4..fbfc7053 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -32,7 +32,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks) list("Prosthetic Limb","Prosthetic Limb (Right Leg)"), list("Paraplegic","Prosthetic Limb (Left Leg)"), list("Paraplegic","Prosthetic Limb (Right Leg)"), - list("Fat Affinity","Fat Aversion") + list("Fat Affinity","Fat Aversion"), + list("Weak Legs", "Strong Legs") ) return ..() diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index cd581fab..319542c8 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -61,15 +61,15 @@ lose_text = "You feel clumsy again." medical_record_text = "Patient scored highly on cardio tests." -// /datum/quirk/strong_legs -// name = "Strong Legs" -// desc = "Your body is able to handle heavier sizes very well." -// mob_trait = TRAIT_STRONGLEGS -// value = 2 -// category = CATEGORY_SEXUAL -// gain_text = "You feel like you can carry more weight." -// lose_text = "Your legs cannot bear heavier loads anymore." -// medical_record_text = "Patient exhibits increased muscle strength in their legs." +/datum/quirk/strong_legs + name = "Strong Legs" + desc = "Your body is able to handle heavier sizes very well." + value = 2 + category = CATEGORY_SEXUAL + mob_trait = TRAIT_STRONGLEGS + gain_text = "You feel like you can carry more weight." + lose_text = "Your legs cannot bear heavier loads anymore." + medical_record_text = "Patient exhibits increased muscle strength in their legs." /datum/quirk/friendly name = "Friendly" diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index ae6d5d81..ad7615c8 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -154,7 +154,7 @@ medical_record_text = "Patient cares little with or dislikes being touched." /datum/quirk/weak_legs - name = "Weak legs" + name = "Weak Legs" desc = "Your legs can't handle the heaviest of charges. Being too fat will render you unable to move at all." mob_trait = TRAIT_WEAKLEGS value = 0 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 7f6d5d37..0387e437 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1863,6 +1863,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(H.fatness < FATNESS_LEVEL_BARELYMOBILE) fatness_delay = fatness_delay - flight + if(HAS_TRAIT(H, TRAIT_STRONGLEGS)) + fatness_delay = fatness_delay * FATNESS_STRONGLEGS_MODIFIER + fatness_delay = min(fatness_delay, FATNESS_MAX_MOVE_PENALTY) if(HAS_TRAIT(H, TRAIT_WEAKLEGS) && (H.fatness > FATNESS_LEVEL_BLOB)) fatness_delay += ((H.fatness - FATNESS_LEVEL_BLOB) * FATNESS_WEAKLEGS_MODIFIER) / FATNESS_DIVISOR From 45d1d42650e1e469ec0470e945977936d153a964 Mon Sep 17 00:00:00 2001 From: MrSky12 <71841824+MrSky12@users.noreply.github.com> Date: Sun, 30 Apr 2023 16:11:36 +0200 Subject: [PATCH 2/3] Turned the LL beach dome into a space ruin OH GOD --- .../space_biodome_beach.dmm} | 72 ++++++++++--------- code/datums/ruins/lavaland.dm | 7 -- code/datums/ruins/space.dm | 7 ++ 3 files changed, 47 insertions(+), 39 deletions(-) rename _maps/RandomRuins/{LavaRuins/lavaland_biodome_beach.dmm => SpaceRuins/space_biodome_beach.dmm} (81%) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm similarity index 81% rename from _maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm rename to _maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm index c7ed7cd0..b0b78186 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm @@ -9,9 +9,9 @@ "ai" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plating,/area/ruin/powered/beach) "aj" = (/turf/closed/wall/mineral/sandstone,/area/ruin/powered/beach) "ak" = (/obj/structure/toilet,/obj/effect/turf_decal/sand,/turf/open/floor/plating,/area/ruin/powered/beach) -"al" = (/obj/structure/urinal{pixel_y = 32},/obj/item/soap,/turf/open/floor/plating,/area/ruin/powered/beach) +"al" = (/obj/structure/urinal{pixel_y = 32},/obj/item/soap,/obj/effect/turf_decal/sand,/turf/open/floor/plating,/area/ruin/powered/beach) "am" = (/obj/structure/urinal{pixel_y = 32},/obj/effect/turf_decal/sand,/turf/open/floor/plating,/area/ruin/powered/beach) -"an" = (/obj/item/flashlight/lantern,/obj/machinery/light/small{dir = 1},/turf/open/floor/plating,/area/ruin/powered/beach) +"an" = (/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/sand,/turf/open/floor/plating,/area/ruin/powered/beach) "ao" = (/obj/structure/sink{dir = 4; pixel_x = 11},/obj/effect/turf_decal/sand,/obj/structure/mirror{pixel_x = 28},/turf/open/floor/plating,/area/ruin/powered/beach) "ap" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "aq" = (/obj/structure/flora/ausbushes/sunnybush,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) @@ -19,7 +19,7 @@ "as" = (/turf/open/floor/plating,/area/ruin/powered/beach) "at" = (/obj/item/tank/internals/oxygen,/turf/open/floor/plating,/area/ruin/powered/beach) "au" = (/obj/effect/turf_decal/sand,/turf/open/floor/plating,/area/ruin/powered/beach) -"av" = (/obj/machinery/door/airlock/sandstone{name = "Lavatory"},/turf/open/floor/plating,/area/ruin/powered/beach) +"av" = (/obj/machinery/door/airlock/sandstone{name = "Lavatory"},/obj/effect/turf_decal/sand,/turf/open/floor/plating,/area/ruin/powered/beach) "aw" = (/obj/machinery/door/airlock/sandstone{name = "Bar Storage"},/turf/open/floor/wood,/area/ruin/powered/beach) "ax" = (/obj/structure/extinguisher_cabinet,/turf/closed/wall/mineral/sandstone,/area/ruin/powered/beach) "ay" = (/obj/effect/turf_decal/sand,/obj/machinery/door/airlock/sandstone{name = "Restroom"},/turf/open/floor/plating,/area/ruin/powered/beach) @@ -87,9 +87,10 @@ "cs" = (/obj/machinery/vending/hydronutrients,/turf/open/floor/wood,/area/ruin/powered/beach) "ct" = (/obj/machinery/light,/obj/effect/overlay/water,/obj/effect/overlay/water/top,/turf/open/floor/plating/beach/water,/area/ruin/powered/beach) "cu" = (/obj/effect/turf_decal/sand,/turf/open/floor/pod/dark,/area/ruin/powered/beach) -"cR" = (/obj/structure/table/wood,/obj/item/tank/internals/oxygen,/obj/item/pickaxe,/obj/item/clothing/mask/gas,/turf/open/floor/pod/dark,/area/ruin/powered/beach) +"cR" = (/obj/item/clothing/suit/space/fragile,/obj/item/clothing/head/helmet/space/orange,/turf/open/floor/pod/dark,/area/ruin/powered/beach) "cW" = (/obj/machinery/light{dir = 4},/turf/open/floor/wood,/area/ruin/powered/beach) "dw" = (/obj/machinery/door/airlock/sandstone{name = "Beach Access"},/turf/open/floor/pod/dark,/area/ruin/powered/beach) +"eD" = (/obj/structure/chair/comfy/plywood,/obj/item/toy/plush/rose,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "fr" = (/obj/machinery/door/airlock/wood/glass,/turf/open/floor/wood,/area/ruin/powered/beach) "fE" = (/obj/effect/turf_decal/stripes/asteroid/line{dir = 1},/obj/effect/turf_decal/sand,/obj/machinery/vending/kink,/turf/open/floor/plasteel,/area/ruin/powered/beach) "gS" = (/obj/effect/turf_decal/sand,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/ruin/powered/beach) @@ -97,12 +98,12 @@ "iq" = (/obj/machinery/light{dir = 8},/obj/effect/overlay/water,/obj/effect/overlay/water/top,/turf/open/floor/plating/beach/water,/area/ruin/powered/beach) "iw" = (/obj/machinery/light/small{brightness = 3; dir = 8},/turf/open/floor/pod/dark,/area/ruin/powered/beach) "jF" = (/obj/effect/turf_decal/sand,/obj/machinery/light/small,/turf/open/floor/plating,/area/ruin/powered/beach) -"lF" = (/obj/machinery/light{dir = 4},/turf/open/floor/pod/dark{initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered/beach) -"lM" = (/obj/structure/dresser,/turf/open/floor/pod/dark,/area/ruin/powered/beach) +"lF" = (/obj/machinery/light{dir = 4},/turf/template_noop,/area/ruin/powered/beach) +"lM" = (/obj/structure/tank_dispenser/oxygen,/turf/open/floor/pod/dark,/area/ruin/powered/beach) "mb" = (/obj/structure/table/wood,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel,/obj/item/reagent_containers/rag/towel,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "mh" = (/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/ruin/powered/beach) "mo" = (/obj/machinery/door/airlock/sandstone{name = "Beach Access"},/obj/effect/turf_decal/sand,/turf/open/floor/pod/dark,/area/ruin/powered/beach) -"mH" = (/obj/machinery/smartfridge/drying_rack,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) +"mH" = (/obj/machinery/smartfridge/drying_rack,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "mL" = (/obj/machinery/light{dir = 8},/obj/structure/chair/stool,/turf/open/floor/carpet/orange,/area/ruin/powered/beach) "mM" = (/obj/structure/flora/ausbushes/sparsegrass,/obj/machinery/light,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "og" = (/obj/machinery/light,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) @@ -117,20 +118,25 @@ "sO" = (/obj/machinery/jukebox/disco/indestructible,/turf/open/floor/light/colour_cycle,/area/ruin/powered/beach) "tK" = (/obj/machinery/vending/cola/red,/turf/open/floor/wood,/area/ruin/powered/beach) "uH" = (/obj/machinery/vending/mealdor,/turf/open/floor/wood,/area/ruin/powered/beach) -"vl" = (/obj/structure/closet/athletic_mixed,/turf/open/floor/pod/dark,/area/ruin/powered/beach) +"vl" = (/obj/structure/closet/athletic_mixed,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "vY" = (/obj/machinery/hydroponics/constructable,/turf/open/floor/wood,/area/ruin/powered/beach) "wY" = (/turf/open/floor/pod/light,/area/ruin/powered/beach) -"yp" = (/obj/item/reagent_containers/spray/spraytan,/obj/effect/turf_decal/sand,/turf/open/floor/plasteel,/area/ruin/powered/beach) +"xB" = (/obj/effect/overlay/water,/obj/effect/overlay/water/top,/obj/structure/flora/rock,/turf/open/floor/plating/beach/water,/area/ruin/powered/beach) +"xU" = (/obj/effect/overlay/palmtree_l,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) +"yp" = (/obj/structure/chair/comfy/plywood,/obj/item/toy/plush/metha,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "zw" = (/obj/structure/mineral_door/woodrustic,/turf/open/floor/wood,/area/ruin/powered/beach) "AI" = (/obj/machinery/vending/cigarette/beach,/turf/open/floor/wood,/area/ruin/powered/beach) "Bl" = (/obj/effect/turf_decal/sand,/obj/machinery/light{dir = 8},/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "Cy" = (/obj/machinery/light{dir = 4},/obj/effect/overlay/water,/obj/effect/overlay/water/top,/turf/open/floor/plating/beach/water,/area/ruin/powered/beach) "CP" = (/obj/effect/turf_decal/sand,/obj/machinery/light{dir = 8},/turf/open/floor/plasteel,/area/ruin/powered/beach) -"Dc" = (/obj/structure/closet/athletic_mixed,/obj/effect/turf_decal/sand,/turf/open/floor/pod/dark,/area/ruin/powered/beach) +"Dc" = (/obj/effect/turf_decal/sand,/obj/machinery/shower{pixel_y = 24},/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) +"Dl" = (/obj/effect/mob_spawn/human/bartender/alive,/turf/closed/wall/mineral/sandstone,/area/ruin/powered/beach) +"Dp" = (/obj/machinery/light{dir = 8},/obj/structure/rack,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "Ec" = (/obj/machinery/vending/clothing,/turf/open/floor/wood,/area/ruin/powered/beach) "Ga" = (/obj/effect/turf_decal/caution{dir = 8},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel,/area/ruin/powered/beach) "Gc" = (/obj/effect/turf_decal/sand,/turf/open/floor/pod/light,/area/ruin/powered/beach) -"HC" = (/obj/structure/rack,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/effect/turf_decal/sand,/turf/open/floor/pod/dark,/area/ruin/powered/beach) +"HC" = (/obj/effect/turf_decal/sand,/obj/structure/closet/athletic_mixed,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) +"It" = (/obj/structure/table/wood,/obj/item/reagent_containers/spray/spraytan,/turf/open/floor/wood,/area/ruin/powered/beach) "Kf" = (/obj/structure/bed,/obj/item/bedsheet/brown,/turf/open/floor/carpet/orange,/area/ruin/powered/beach) "NM" = (/obj/effect/turf_decal/sand,/obj/machinery/light/small{dir = 4},/turf/open/floor/pod/dark,/area/ruin/powered/beach) "Ol" = (/obj/effect/turf_decal/stripes/asteroid/line{dir = 1},/obj/effect/turf_decal/sand,/obj/machinery/light{dir = 1},/turf/open/floor/plasteel,/area/ruin/powered/beach) @@ -144,39 +150,41 @@ "UM" = (/obj/effect/overlay/palmtree_l,/obj/machinery/light{dir = 4},/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "VN" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/pod/dark,/area/ruin/powered/beach) "VO" = (/turf/open/floor/pod/dark,/area/ruin/powered/beach) -"Xp" = (/obj/effect/turf_decal/sand,/obj/machinery/light/small{brightness = 3; dir = 8},/turf/open/floor/pod/dark,/area/ruin/powered/beach) -"Xr" = (/obj/machinery/light{dir = 8},/turf/open/floor/pod/dark{initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered/beach) +"WR" = (/obj/machinery/light{dir = 4},/obj/structure/rack,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) +"Xp" = (/obj/structure/chair/comfy/plywood,/obj/item/toy/plush/mammal/fox,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) +"Xr" = (/obj/machinery/light{dir = 8},/turf/template_noop,/area/ruin/powered/beach) "Zh" = (/obj/machinery/seed_extractor,/turf/open/floor/wood,/area/ruin/powered/beach) +"Zl" = (/obj/item/clothing/head/helmet/space/orange,/obj/item/clothing/suit/space/fragile,/turf/open/floor/pod/dark,/area/ruin/powered/beach) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaa -aaaaaaaabWbWbWadbWaeafagahaiajakajalamanaobWcdQSQSQSQSQSQSQSQSQScsbWbWbWaaaaaaaa -aaaaaabWbWaqararbWabasasasatajjFavasasauaubWarQSpUacqTQSEcTPQRQSaCaCvYbWbWaaaaaa -aaaabWbWadarapchbWbWajawajaxajajajajajajaybWcgQSmLbebezwaCaCcWQSbmaCaCZhbWbWaaaa +aaaaaaaabWbWbWadajaeafagahaiajakajalamanaoajcdQSQSQSQSQSQSQSQSQScsbWbWbWaaaaaaaa +aaaaaabWbWaqararajabasasasatajjFavauauauauajarQSpUacqTQSEcTPQRQSaCaCvYbWbWaaaaaa +aaaabWbWadarapchajajajawajaxajajajajajajayajcgQSmLbebezwaCaCcWQSbmaCaCZhbWbWaaaa aaaabWapararazarcefEajaCaDhYaFaEaHaIajaJaKcearQSbebeTtQSaCaCaCQSQSfrQSQSQSbWaaaa -aabWbWarararararaAaKajaCaCaCaCaCaCaMajaNaKaAapQSQSQSQSQSaCaCaCQSaAaAaAarmHbWbWaa -aabWaparaOaraOaraAgSajaPaQaPaRajaCaSajaTaKaAapQSpUacqTQSaCaCaCQSaUararaqarapbWaa -aabWcgararaVararaAaKOlaWaWaWaWajaCaXajaYaKaAarQSmLbebezwaCaCaGQSarbEaZaVarchbWaa -lFbWararbbarbbaraAaKaKaKoKaKaKbcRObdajSXaKaAarQSbebeKfQSaCaCAIQSarararoDarapbWXr -aabWararararararaAaKaKGasOsygSajbgajajCPaKaAaUQSQSQSQSQSaCaCuHQSararararararbWaa -bWbWbWbWcgarararaAaKaKaKblaKaKcjaBaBcjaKaKaAarQSpUacqTQSaCaCtKQSarbzarchbWbWbWbW -bWvlHCmhararararaAypaKaKaKaKaKaKaKaKaKaKaKaAarQSmLbebezwaCaCcWQSararararmhDcHCbW -bWiwVOmhararaUaraAaAaAaAaAaAaAaAaAaAaAaAaAaAarQSbebeKfQSaCaCaCQSararararmhVONMbW -pIwYGcmhBlaraZarapararararararararararararararQSQSQSQSQSQSzwQSQSarararoTmhwYwYpI -bWpgGcdwaAarararararararbxaparararaZararaparararararararaAaAaAaUaraparaAmoGccfbW -pIwYwYmhBlararararaparmMararararaUarararararararararaparogararararararoTmhGcGcpI -bWXpVOmharbzararapbxchbWcgarapararararbAbBarararaUararchbWcgarararaZararmhcuVNbW -bWcRlMmharararararararPbararbEararbFchbGbHcgmbaparararapPbararaUararararmhlMcRbW -bWbWbWbWcgbJarbJarbJarbJbKbJarbJapararbLbMarararbJarbJarbJarbJarbJarbJUMbWbWbWbW +aabWbWarararararaAaKajaCaCaCaCaCaCaMajaNaKaAapQSQSQSQSQSaCaCaCQSaAaAaAaAmHbWbWaa +aabWaparaOaraOaraAgSajItaQaPaRajaCaSajaTaKaAapQSpUacqTQSaCaCaCQSxUararaqaAapbWaa +aabWcgararaVararaAaKOlaWaWaWaWDlaCaXajaYaKaAarQSmLbebezwaCaCaGQSaAbEaZaVaAchbWaa +lFbWararbbarbbaraAaKaKaKoKaKaKbcRObdajSXaKaAarQSbebeKfQSaCaCAIQSaAararoDaAapbWXr +aabWararararararaAaKaKGasOsygSajbgajajCPaKaAaUQSQSQSQSQSaCaCuHQSaAararaAaAarbWaa +bWbWbWbWDparararaAaKaKaKblaKaKcjaBaBcjaKaKaAarQSpUacqTQSaCaCtKQSaAbzarWRbWbWbWbW +bWlMcRmhHCarararaAaKaKaKaKaKaKaKaKaKaKaKaKaAarQSmLbebezwaCaCcWQSaAararvlmhlMcRbW +bWiwVOmhaAaraUaraAaAaAaAaAaAaAaAaAaAaAaAaAaAarQSbebeKfQSaCaCaCQSaAararaAmhVONMbW +pIwYGcmhBlaraZarapararararararararararararararQSQSQSQSQSQSzwQSQSaAararoTmhwYwYpI +bWpgGcdwaAarararararararbxaparararaZararapararDcDcDcDcaAaAaAaAxUaAaparaAmoGccfbW +pIGcwYmhBlararararaparmMararararaUarararararararararaparogararararararoTmhGcGcpI +bWiwVOmhaAbzararapbxchbWcgarapararararbAbBarararaUararchbWcgarararaZaraAmhcuVNbW +bWlMZlmhaAararararararPbararbEararbFchbGbHcgmbaparararapPbararaUarararaAmhlMcRbW +bWbWbWbWcgypareDarbJarbJbKbJarbJapararbLbMarararXparbJarbJarbJarbJarbJUMbWbWbWbW aabWadapbNararbEbOararararararararbzarararbPararararararararaparararararapbNbWaa lFbWbQbRbRbSbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbSbRbRbRbWXr aabWbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbWaa aabWbWbUbUbUbUbUbUbUbUbUbUctbUbUbUbUbUbUctbUbUbUbUbUbUctbUbUbUbUbUbUbUbUbUbWbWaa -aaaabWctbUbUbUbUbUbUbUbUCybWiqbUbVbUbUCybWiqbUbUbUbUCybWiqbUbUbUbUbUbUbUctbWaaaa +aaaabWctbUbUbUbUbUbUbUbUCybWiqbUbVbUbUCybWiqbUbUbUbUCybWiqxBbUbUbUbUbUbUctbWaaaa aaaabWbWbUbUbUbUbUbVbUbUbUbWbUbUbUbUbUbUbWbUbUbUbUbUbUbWbUbUbUbUbUbUbUbUbWbWaaaa aaaaaabWbWbUctbUbUbUbUbUbUbWbUbUbUbUbUbUbWbVbUbUbUbUbUbWbUbUbUbUbUctbUbWbWaaaaaa -aaaaaaaabWbWbWbUbUbUbUbUbUbWbUbUbUbUbUbUbWbUbUbUbUbUbUbWbUbUbUbUbUbWbWbWaaaaaaaa +aaaaaaaabWbWbWbUbUbUbUxBbUbWbUbUbUbUbUbUbWbUbUbUbUbUbUbWbUbUbUbUxBbWbWbWaaaaaaaa aaaaaaaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index ac00a5e6..c913304b 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -7,13 +7,6 @@ cost = 5 allow_duplicates = FALSE -/datum/map_template/ruin/lavaland/biodome/beach - name = "Biodome Beach" - id = "biodome-beach" - description = "Seemingly plucked from a tropical destination, this beach is calm and cool, with the salty waves roaring softly in the background. \ - Comes with a rustic wooden bar and suicidal bartender." - suffix = "lavaland_biodome_beach.dmm" - /datum/map_template/ruin/lavaland/biodome/winter name = "Biodome Winter" id = "biodome-winter" diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index a218215a..34cd505b 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -339,3 +339,10 @@ description = "A small hub containing a quantum pad connected to xenoarch along with three other rooms containing unlinked quantum pads and the parts needed to make new quantum pads." cost = 0 always_place = TRUE + +/datum/map_template/ruin/space/biodome/beach + name = "Biodome Beach" + id = "biodome-beach" + description = "Seemingly plucked from a tropical destination, this beach is calm and cool, with the salty waves roaring softly in the background. \ + Comes with a rustic wooden bar and suicidal bartender." + suffix = "space_biodome_beach.dmm" From 946170302a44d5cad17da16f6cc335d299056352 Mon Sep 17 00:00:00 2001 From: MrSky12 <71841824+MrSky12@users.noreply.github.com> Date: Sun, 30 Apr 2023 16:13:35 +0200 Subject: [PATCH 3/3] Chocolate tile has been fixed --- GainStation13/icons/turf/floor_candy.dmi | Bin 3816 -> 3914 bytes code/game/turfs/open.dm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/GainStation13/icons/turf/floor_candy.dmi b/GainStation13/icons/turf/floor_candy.dmi index ba458739dcc3cab47d91d3ed0b77032898ebfb43..13698467738c55c66e5722f0ea521f7ffbba91ed 100644 GIT binary patch delta 3440 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 S&^YY?0000Ps{ delta 3341 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