Merge branch 'master' into master

This commit is contained in:
Alphas00
2024-06-11 23:19:16 +02:00
committed by GitHub
11 changed files with 166 additions and 65 deletions
@@ -49,7 +49,7 @@
to_chat(user, "<span class='warning'>You get some juice out of you...</span>")
return
..()
/obj/effect/decal/cleanable/juice
name = "berry juice"
desc = "It's blue and smells enticingly sweet."
@@ -65,3 +65,13 @@
/obj/effect/decal/cleanable/juice/streak
random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
//extreme variant, for admin or item purposes
/datum/symptom/berry/extreme
name = "Extreme berrification"
stealth = -7
resistance = 11
stage_speed = 10
transmittable = 2
level = 7
severity = 5
@@ -151,7 +151,6 @@
name = "grey modular bra"
desc = "A tasteful grey bra that reminds you of the good old days. Now adjusts to the match the wearer's size!"
icon_location = 'GainStation13/icons/mob/modclothes/graymodular_bra.dmi'
icon = 'GainStation13/icons/mob/modclothes/gray_bra.dmi'
icon_state = "grey"
item_state = "defaultsuit"
item_color = "defaultsuit"
item_state = "grey_bra"
item_color = "grey_bra"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

@@ -1,49 +1,99 @@
"a" = (/obj/structure/flora/junglebush/b,/turf/open/floor/grass,/area/ruin/powered)
"b" = (/turf/closed/indestructible/riveted/boss,/area/ruin/unpowered)
"c" = (/turf/open/floor/grass,/area/ruin/powered)
"d" = (/obj/structure/mineral_door/woodrustic,/obj/structure/fans/tiny/invisible,/turf/open/floor/grass,/area/ruin/powered)
"e" = (/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"f" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked,/obj/structure/statue/blueberry,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"g" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"h" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"i" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/structure/stone_tile/burnt{dir = 1; icon_state = "burnt_tile1"},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"j" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked{dir = 4; icon_state = "cracked_tile1"},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"k" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked{dir = 1; icon_state = "cracked_tile1"},/obj/structure/statue/blueberry,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"l" = (/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered)
"m" = (/turf/template_noop,/area/template_noop)
"n" = (/obj/structure/flora/junglebush/c,/turf/open/floor/grass,/area/ruin/powered)
"o" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/structure/stone_tile/burnt{dir = 8; icon_state = "burnt_tile1"},/obj/structure/statue/blueberry,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"q" = (/turf/open/water,/area/ruin/powered)
"G" = (/turf/closed/indestructible/riveted/boss,/area/ruin/powered)
"H" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/structure/statue/blueberry,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"I" = (/obj/structure/flora/junglebush/b,/obj/machinery/light{base_state = null; dir = 1; icon = null; icon_state = null; invisibility = 1; overlayicon = null},/turf/open/floor/grass,/area/ruin/powered)
"O" = (/obj/item/reagent_containers/food/snacks/muffin/berry{desc = "A delicious and spongy little cake, with blueberries."; name = "blueberry muffin"},/turf/open/floor/grass,/area/ruin/powered)
"U" = (/obj/machinery/light{base_state = null; dir = 1; icon = null; icon_state = null; invisibility = 1; overlayicon = null},/turf/open/floor/grass,/area/ruin/powered)
"aa" = (/obj/structure/stone_tile/block/cracked,/obj/structure/stone_tile{dir = 1},/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"ak" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"ap" = (/turf/open/floor/plasteel/stairs{dir = 4},/area/ruin/powered)
"aW" = (/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/floor/carpet/blue,/area/ruin/powered)
"cI" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/decal/cleanable/blood/splatter{color = "#151C62"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"cQ" = (/obj/structure/stone_tile{dir = 1},/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"cR" = (/obj/effect/decal/cleanable/blood{color = "#151C62"},/obj/item/trash/blueberry_gum{pixel_y = -8; pixel_x = -20},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"dI" = (/obj/effect/decal/cleanable/blood/drip{color = "#151C62"},/turf/open/floor/carpet/blue,/area/ruin/powered)
"dJ" = (/obj/structure/stone_tile/block/cracked,/obj/structure/stone_tile{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"fn" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked{dir = 1; icon_state = "cracked_tile1"},/obj/item/pickaxe/silver,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"gg" = (/obj/structure/stone_tile/block{dir = 1; icon_state = "pristine_block1"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"gj" = (/obj/structure/stone_tile/burnt,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"gl" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/structure/stone_tile{dir = 8},/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"hk" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked{dir = 4; icon_state = "cracked_tile1"},/obj/structure/stone_tile,/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"iH" = (/obj/structure/stone_tile/burnt{dir = 8; icon_state = "burnt_tile1"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"iY" = (/obj/structure/table/abductor,/obj/item/reagent_containers/food/snacks/muffin/berry{pixel_y = 3},/turf/open/floor/carpet/blue,/area/ruin/powered)
"jy" = (/turf/open/water,/area/ruin/powered)
"kK" = (/obj/structure/mineral_door/woodrustic,/obj/structure/fans/tiny/invisible,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"lh" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"lZ" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked{dir = 4; icon_state = "cracked_tile1"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"md" = (/obj/structure/stone_tile/surrounding/cracked,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"mo" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"mD" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked{dir = 4; icon_state = "cracked_tile1"},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"nh" = (/obj/structure/table/abductor,/obj/item/reagent_containers/glass/bottle/berry{pixel_y = 4},/turf/open/floor/carpet/blue,/area/ruin/powered)
"nD" = (/obj/structure/stone_tile/block/cracked{dir = 8},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"oi" = (/obj/structure/stone_tile/surrounding_tile{dir = 4},/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"oQ" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/railing,/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/obj/structure/railing{dir = 8},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"ph" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/decal/cleanable/blood/tracks{dir = 6; color = "#151C62"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"pi" = (/obj/structure/stone_tile/cracked{dir = 1; icon_state = "cracked_tile1"},/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"pl" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"rI" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/effect/decal/cleanable/blood/drip{color = "#151C62"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"rY" = (/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered)
"sB" = (/obj/effect/decal/cleanable/blood/splats{color = "#151C62"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"tr" = (/obj/structure/railing{dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"tX" = (/obj/structure/stone_tile/block/cracked{dir = 8},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"ua" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked,/obj/structure/statue/blueberry,/obj/structure/stone_tile/block/cracked,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"vb" = (/obj/structure/stone_tile/cracked,/obj/structure/stone_tile/block{dir = 1; icon_state = "pristine_block1"},/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"vd" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"wM" = (/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"xy" = (/turf/template_noop,/area/template_noop)
"xL" = (/obj/structure/statue/blueberry,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"yS" = (/obj/effect/decal/cleanable/blood/tracks{dir = 4; color = "#151C62"},/turf/open/floor/plasteel/stairs{dir = 8},/area/ruin/powered)
"zt" = (/obj/item/clothing/under/rank/security/pink,/obj/effect/decal/cleanable/blood{color = "#151C62"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"zG" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"Ag" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/structure/statue/blueberry,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"At" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/obj/structure/railing{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"AB" = (/obj/structure/stone_tile/surrounding_tile/cracked,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"Bb" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/structure/railing{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"BN" = (/obj/structure/stone_tile/surrounding_tile/burnt,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"CG" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/decal/cleanable/blood/drip{color = "#151C62"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"CM" = (/turf/closed/indestructible/riveted/boss,/area/ruin/unpowered)
"ES" = (/obj/structure/statue/blueberry,/turf/open/floor/carpet/blue,/area/ruin/powered)
"Fx" = (/obj/structure/stone_tile/block/cracked{dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"FG" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/structure/railing{dir = 8},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"FO" = (/obj/effect/decal/cleanable/blood{color = "#151C62"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"Hh" = (/obj/structure/stone_tile/surrounding/cracked{dir = 4},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"In" = (/turf/closed/indestructible/riveted/boss,/area/ruin/powered)
"Ld" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/structure/railing{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"Mo" = (/obj/structure/stone_tile/block/cracked{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"MZ" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/structure/stone_tile/burnt{dir = 1; icon_state = "burnt_tile1"},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"Pb" = (/turf/open/floor/carpet/blue,/area/ruin/powered)
"Pe" = (/obj/effect/decal/cleanable/blood/drip{color = "#151C62"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"PM" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/structure/railing{dir = 8},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"QC" = (/obj/structure/stone_tile/block/cracked,/obj/structure/stone_tile{dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"RF" = (/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"RH" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/railing,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"RI" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/railing,/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/obj/structure/railing{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"Se" = (/obj/structure/stone_tile/surrounding_tile{dir = 8},/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"Xy" = (/obj/structure/stone_tile/surrounding_tile{dir = 8},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/powered)
"YV" = (/obj/structure/stone_tile/block{dir = 4; icon_state = "pristine_block1"},/obj/structure/stone_tile/cracked{dir = 1; icon_state = "cracked_tile1"},/obj/structure/statue/blueberry,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
"Zz" = (/obj/structure/stone_tile/block{dir = 8; icon_state = "pristine_block1"},/obj/structure/stone_tile/burnt{dir = 8; icon_state = "burnt_tile1"},/obj/structure/statue/blueberry,/obj/structure/stone_tile/block/cracked,/turf/open/floor/plating/asteroid/basalt,/area/ruin/unpowered)
(1,1,1) = {"
mmmmeeeeeeeeeeeeeeeemmmmm
mmeeeeeelllllllleeeeeemmm
meeebellllllllllllebeeemm
meebllllllllllllllllbeemm
meebllGGGGGGGGGGGGllbeemm
meellGUccUqqqqUccUGlleemm
meelGGcacqqqqqqcccGGleemm
mellGGGUqqcccqqcUGGGllemm
melllGcqqccOqqccacGlllemm
melllGcqqcccccccccGlllemm
mellGIcqqccccccccnUGllemm
mellGcccqqqccccccccGllemm
mellGccccnqqcccccccGllemm
mellGccccccccccccccGllemm
mellGUccUccccccUccUGllemm
meellGcaGGGddGGGacGlleemm
meelllbbbbfeeobbbbllleemm
meebblllbbgeehbblllbbeemm
meeeebllllieejllllbeeeemm
mmeeeellllgeehlllleeeemmm
mmeeeellllgeejlllleeeemmm
mmeeeeeeelgeehleeeeeeemmm
mmmeeeeeebkeeHbeeeeeemmmm
mmmmmmmmeegeeheemmmmmmmmm
mmmmmmmmmbeeeebmmmmmmmmmm
xyxyxyxyRFRFRFRFRFRFRFRFRFRFRFRFRFRFRFRFxyxyxyxyxy
xyxyRFRFRFRFRFRFrYrYrYrYrYrYrYrYRFRFRFRFRFRFxyxyxy
xyRFRFRFCMCMrYrYrYrYInrYrYInrYrYrYrYCMCMRFRFRFxyxy
xyRFRFCMrYrYrYrYInrYInrYrYInrYInrYrYrYrYCMRFRFxyxy
xyRFRFCMrYrYrYInInInInInInInInInInrYrYrYCMRFRFxyxy
xyRFRFrYrYrYInInaaFGPbaWaWPbAtdJInInrYrYrYRFRFxyxy
xyRFRFrYrYrYInQCABFGESnhiYESLdiHdJInrYrYrYRFRFxyxy
xyRFrYrYrYInInMowMFGPbPbdIPbLdwMlhInInrYrYrYRFxyxy
xyRFrYrYrYInglgjwMPMvdCGvdvdBbwMXyhkInrYrYrYRFxyxy
xyRFrYrYrYInrIFOPeoQRHcIplRHRIwMwMlhInrYrYrYRFxyxy
xyRFrYrYInInrIztcRySySphplapapwMwMlhInInrYrYRFxyxy
xyRFrYrYInjyfnsBPewMtrtrtrtrwMwMwMnDjyInrYrYRFxyxy
xyRFrYrYInjyzGxLwMPewMwMwMwMwMwMxLlZjyInrYrYRFxyxy
xyRFrYrYInjyvbggFxggcQwMwMoiFxggggpijyInrYrYRFxyxy
xyRFrYrYInjyjyjyjyjyInwMwMInjyjyjyjyjyInrYrYRFxyxy
xyRFRFrYInInInInInInInkKkKInInInInInInInrYRFRFxyxy
xyRFRFrYrYInrYInrYCMuaBNSeZzCMrYInrYInrYrYRFRFxyxy
xyRFRFrYrYrYrYInrYCMmoRFRFakCMrYInrYrYrYrYRFRFxyxy
xyRFRFCMCMrYrYrYrYCMMZRFRFmDCMrYrYrYrYCMCMRFRFxyxy
xyxyRFRFRFCMrYrYrYrYmoRFRFtXrYrYrYrYCMRFRFRFxyxyxy
xyxyRFRFRFCMrYrYrYrYmoRFRFmDrYrYrYrYCMRFRFRFxyxyxy
xyxyRFRFRFRFRFRFRFrYmoRFRFakrYRFRFRFRFRFRFRFxyxyxy
xyxyxyRFRFRFRFRFRFCMYVRFRFAgCMRFRFRFRFRFRFxyxyxyxy
xyxyxyxyxyxyxyxyRFRFmoRFRFakRFRFxyxyxyxyxyxyxyxyxy
xyxyxyxyxyxyxyxyxyCMHhRFRFmdCMxyxyxyxyxyxyxyxyxyxy
"}
+8 -1
View File
@@ -8075,6 +8075,13 @@
/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,
/turf/open/candyfloor,
/area/ruin/powered/candyland)
"wo" = (
/obj/structure/sign/plaques/kiddie{
desc = "Prototype of propulsion-based mass increase machine. Pseudonym: La Machina.";
name = "Experiment #3 Plaque"
},
/turf/closed/wall,
/area/xenoarch/caloriteresearch_powered)
"wt" = (
/obj/effect/turf_decal/tile/bar{
dir = 8
@@ -65904,7 +65911,7 @@ TC
Ny
OA
OA
OA
wo
GT
Zt
Zt
+11 -1
View File
@@ -37126,6 +37126,16 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/medical/chemistry)
"bwZ" = (
/obj/structure/sign/plaques/golden{
desc = "In this spot of maintenance, Ambire E. and Vedi managed to break a record of almost two million tons of weight on a single person, almost leading to destabilization of reality and causation of a black hole." ;
name = "Golden Record Plaque";
pixel_y = 32
},
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
/area/maintenance/department/security/brig)
"bxc" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -82261,7 +82271,7 @@ apB
aiu
aiu
aiu
aoK
bwZ
aiu
azY
axC
+16
View File
@@ -71,3 +71,19 @@
name = "Blueberry virus bottle"
desc = "A small bottle. Contains blueberry virus in synthblood medium."
spawned_disease = /datum/disease/advance/berry_virus
//admin variant of berry virus
/datum/disease/advance/berry_virus_extreme
copy_type = /datum/disease/advance
/datum/disease/advance/berry_virus_extreme/New(make_typecache = TRUE)
name = "Blueberry Virus"
symptoms = list(new/datum/symptom/berry/extreme)
..()
/obj/item/reagent_containers/glass/bottle/berry_extreme
name = "Blueberry virus bottle"
desc = "A small bottle. Contains blueberry virus in synthblood medium."
spawned_disease = /datum/disease/advance/berry_virus_extreme
+10 -1
View File
@@ -273,4 +273,13 @@
description = "Somewhere on this planet, a gluttony deity is worshipped for food and life."
suffix = "lavaland_surface_caloriteshrine.dmm"
allow_duplicates = TRUE
cost = 0
cost = 0
/datum/map_template/ruin/lavaland/blueberry_shrine //GS13
name = "Blueberry Shrine"
id = "blueberryshrine"
description = "A strange temple, littered with oddly round sculptures and peculiar blue stains."
suffix = "lavaland_surface_blueberryarea.dmm"
allow_duplicates = TRUE
cost = 0
+1 -1
View File
@@ -316,7 +316,7 @@
/obj/structure/statue/blueberry
name = "blueberry statue"
desc = "A statue resembling a poor humanoid creature shaped like a ball."
desc = "A statue resembling a humanoid bloated into a round spherical shape."
icon_state = "blueberry"
+11 -11
View File
@@ -84,17 +84,17 @@
/obj/item/clothing/shoes/kindleKicks)
crate_name = "footie crate"
// /datum/supply_pack/misc/modular_greysuits
// name = "Modular Greysuits Crate"
// desc = "In case of sudden obesity, this stretchable jumpsuit pack can help cover up any exposed bodies!"
// cost = 2000
// contains = list(/obj/item/clothing/under/color/grey/modular,
// /obj/item/clothing/under/color/grey/modular,
// /obj/item/clothing/under/color/grey/modular,
// /obj/item/clothing/under/color/grey/modular,
// /obj/item/clothing/under/color/grey/modular,
// /obj/item/clothing/under/color/grey/modular)
// crate_name = "modular jumpsuits crate"
/datum/supply_pack/misc/modular_greysuits
name = "Modular Greysuits Crate"
desc = "In case of sudden obesity, this stretchable jumpsuit pack can help cover up any exposed bodies!"
cost = 2000
contains = list(/obj/item/clothing/under/color/grey/modular,
/obj/item/clothing/under/color/grey/modular,
/obj/item/clothing/under/color/grey/modular,
/obj/item/clothing/under/color/grey/modular,
/obj/item/clothing/under/color/grey/modular,
/obj/item/clothing/under/color/grey/modular)
crate_name = "modular jumpsuits crate"
/datum/supply_pack/misc/randombedsheets
name = "Bedsheet Crate (R)"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 386 KiB

After

Width:  |  Height:  |  Size: 386 KiB