diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
index 0f907471..9ffbce39 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
@@ -8,90 +8,338 @@
"c" = (
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
+"d" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
"e" = (
/turf/open/lava/smooth,
/area/ruin/powered/gluttony)
"f" = (
-/obj/item/reagent_containers/syringe/gluttony,
-/obj/item/reagent_containers/glass/bottle/weightgain,
-/turf/open/floor/plasteel/freezer,
+/obj/item/reagent_containers/syringe/gluttony{
+ pixel_y = -6
+ },
+/obj/item/reagent_containers/glass/beaker/lipoifier{
+ pixel_y = 8
+ },
+/turf/open/floor/mineral/calorite/hide,
/area/ruin/powered/gluttony)
"g" = (
/obj/effect/gluttony,
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/mineral/basaltstone_floor,
/area/ruin/powered/gluttony)
"h" = (
/obj/item/veilrender/vealrender,
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"i" = (
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/mineral/basaltstone_floor,
/area/ruin/powered/gluttony)
"j" = (
/obj/item/trash/plate,
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"k" = (
+/turf/closed/wall/mineral/calorite,
/area/ruin/powered/gluttony)
"l" = (
/obj/item/trash/candy,
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"m" = (
/obj/item/trash/raisins,
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"n" = (
/obj/item/trash/pistachios,
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/mineral/basaltstone_floor,
/area/ruin/powered/gluttony)
"o" = (
/obj/item/trash/popcorn,
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"p" = (
/obj/item/trash/semki,
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"q" = (
/obj/item/trash/syndi_cakes,
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"r" = (
/obj/effect/gluttony,
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"t" = (
/obj/machinery/light/small{
dir = 1
},
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"u" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"v" = (
/obj/machinery/light/small,
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"x" = (
+/obj/effect/gluttony,
+/turf/open/floor/mineral/calorite/hide,
/area/ruin/powered/gluttony)
"z" = (
/obj/item/trash/plate,
/obj/machinery/light/small{
dir = 8
},
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"A" = (
/obj/machinery/light/small{
dir = 4
},
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"B" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"C" = (
+/obj/effect/gluttony,
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"D" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"E" = (
+/obj/item/trash/candy,
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"F" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/gluttony,
+/turf/open/floor/mineral/calorite/hide,
+/area/ruin/powered/gluttony)
+"G" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/gluttony,
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"H" = (
+/obj/item/trash/candy,
+/turf/open/floor/mineral/basaltstone_floor,
+/area/ruin/powered/gluttony)
+"I" = (
+/obj/item/trash/raisins,
+/turf/open/floor/mineral/basaltstone_floor,
+/area/ruin/powered/gluttony)
+"K" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"L" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"O" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/effect/gluttony,
+/turf/open/floor/mineral/calorite/hide,
+/area/ruin/powered/gluttony)
+"P" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
"R" = (
-/turf/closed/indestructible/riveted/uranium,
+/obj/structure/statue/calorite/fatty,
+/turf/open/floor/mineral/calorite/hide,
/area/ruin/powered/gluttony)
"S" = (
/obj/machinery/door/airlock/uranium,
/obj/structure/fans/tiny/invisible,
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/mineral/basaltstone_floor,
+/area/ruin/powered/gluttony)
+"T" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/gluttony,
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"U" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/gluttony,
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"V" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/effect/gluttony,
+/turf/open/floor/mineral/calorite/hide,
+/area/ruin/powered/gluttony)
+"W" = (
+/obj/effect/turf_decal/tile/brown{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/brown,
+/turf/open/floor/plasteel,
+/area/ruin/powered/gluttony)
+"X" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/brown{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/gluttony,
+/turf/open/floor/mineral/calorite/hide,
+/area/ruin/powered/gluttony)
+"Y" = (
+/obj/effect/gluttony,
+/obj/effect/turf_decal/tile/brown,
+/turf/open/floor/plasteel,
/area/ruin/powered/gluttony)
(1,1,1) = {"
@@ -169,11 +417,11 @@ b
b
b
c
-R
-R
+k
+k
S
-R
-R
+k
+k
c
b
a
@@ -191,11 +439,11 @@ a
b
b
c
-R
+k
h
i
o
-R
+k
c
b
a
@@ -213,11 +461,11 @@ a
b
b
c
-R
-i
+k
+B
i
v
-R
+k
c
b
b
@@ -235,11 +483,11 @@ b
b
b
c
-R
-i
-l
-i
-R
+k
+B
+H
+K
+k
c
b
b
@@ -249,7 +497,7 @@ b
a
"}
(8,1,1) = {"
-a
+b
b
c
c
@@ -257,11 +505,11 @@ c
c
c
c
-R
+k
t
i
m
-R
+k
c
c
c
@@ -272,58 +520,58 @@ b
"}
(9,1,1) = {"
b
-b
c
-R
-R
-R
-R
-R
-R
-g
-m
+c
+k
+k
+k
+k
+k
+k
+U
+I
v
-R
-R
-R
-R
-R
-R
+k
+k
+k
+k
+k
+k
c
b
"}
(10,1,1) = {"
-a
b
c
-R
+k
+k
e
-R
-r
+k
+O
+V
+V
+T
g
-g
-g
-g
-i
+d
p
-i
+D
z
l
-i
-R
+W
+k
c
b
"}
(11,1,1) = {"
-a
b
c
+k
R
f
-g
-g
-g
-g
+x
+x
+x
+x
g
n
i
@@ -337,51 +585,51 @@ b
b
"}
(12,1,1) = {"
-a
b
c
-R
+k
+k
e
-R
-r
-g
-g
-g
+k
+X
+F
+F
+G
i
-g
-i
-l
+Y
+L
+E
A
-i
+L
q
-R
+k
c
b
"}
(13,1,1) = {"
-a
b
c
-R
-R
-R
-R
-R
-R
-g
+c
+k
+k
+k
+k
+k
+k
+C
i
v
-R
-R
-R
-R
-R
-R
+k
+k
+k
+k
+k
+k
c
b
"}
(14,1,1) = {"
-a
+b
b
c
c
@@ -389,11 +637,11 @@ c
c
c
c
-R
+k
r
i
-i
-R
+K
+k
c
c
c
@@ -411,11 +659,11 @@ b
b
b
c
-R
-i
+k
+B
g
-i
-R
+K
+k
c
b
b
@@ -433,11 +681,11 @@ b
b
b
c
-R
+k
j
i
v
-R
+k
c
b
b
@@ -455,11 +703,11 @@ b
b
b
c
-R
-i
+k
+u
n
-i
-R
+P
+k
c
b
b
@@ -477,11 +725,11 @@ b
b
b
c
-R
-R
+k
+k
S
-R
-R
+k
+k
c
b
b
diff --git a/_maps/map_files/Mining/Lavaland_Demone.dmm b/_maps/map_files/Mining/Lavaland_Demone.dmm
index 7d74b2de..d5ac23a0 100644
--- a/_maps/map_files/Mining/Lavaland_Demone.dmm
+++ b/_maps/map_files/Mining/Lavaland_Demone.dmm
@@ -257,7 +257,7 @@
"qA" = (/obj/structure/stone_tile/slab/cracked,/turf/open/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors)
"qB" = (/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
"qF" = (/obj/structure/cable{icon_state = "1-8"},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel,/area/lavaland/demone/living)
-"qH" = (/obj/structure/mineral_door/paperframe,/turf/open/floor/wood,/area/lavaland/surface/outdoors)
+"qH" = (/obj/structure/mineral_door/paperframe,/obj/structure/fans/tiny/invisible,/turf/open/floor/wood,/area/lavaland/surface/outdoors)
"qJ" = (/obj/machinery/light{dir = 8},/obj/structure/closet/crate/wooden,/obj/item/mop,/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/turf/open/floor/wood,/area/lavaland/demone/demonevillage)
"qK" = (/obj/structure/fans/tiny,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 1},/obj/machinery/door/airlock/public/glass{name = "Lounge Area"},/turf/open/floor/carpet/red,/area/lavaland/demone/lobby)
"qL" = (/obj/structure/bookcase,/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
@@ -281,7 +281,7 @@
"rJ" = (/obj/structure/sign/warning,/turf/closed/wall/r_wall,/area/lavaland/demone/tele)
"rK" = (/obj/item/flashlight/lantern{icon_state = "lantern-on"; on = 1},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
"rL" = (/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/lavaland/demone/villagepsu)
-"rU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/obj/structure/mineral_door/wood{name = "Office"},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice)
+"rU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice)
"rV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/turf/closed/wall/mineral/iron,/area/lavaland/demone/demonevillage)
"rX" = (/obj/item/twohanded/required/kirbyplants/random,/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice)
"rY" = (/obj/machinery/door/airlock/mining/glass,/turf/open/floor/plating,/area/lavaland/demone/living)
@@ -369,7 +369,7 @@
"xm" = (/obj/machinery/conveyor{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/vault,/area/lavaland/demone/factory)
"xn" = (/obj/structure/cable/cyan{icon_state = "0-8"},/obj/machinery/light{dir = 1},/obj/machinery/power/port_gen/pacman/super,/turf/open/floor/plating,/area/lavaland/demone/factorygen)
"xs" = (/turf/open/floor/mineral/basaltstone_floor,/area/lavaland/demone/factorystorage)
-"xw" = (/obj/structure/mineral_door/wood{name = "Office"},/obj/structure/mineral_door/wood{name = "Office"},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice)
+"xw" = (/obj/structure/mineral_door/wood{name = "Office"},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice)
"xx" = (/turf/open/floor/plating,/area/lavaland/demone/villagesilo)
"xA" = (/obj/structure/window/fulltile,/turf/open/floor/plasteel/cafeteria,/area/lavaland/demone/kitchen)
"xE" = (/obj/structure/railing{dir = 8},/obj/structure/railing,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm
index 760688d5..948e5244 100644
--- a/_maps/map_files/Mining/Lavaland_Lower.dmm
+++ b/_maps/map_files/Mining/Lavaland_Lower.dmm
@@ -6725,9 +6725,7 @@
/obj/structure/window/reinforced/spawner{
dir = 8
},
-/turf/open/floor/plating{
- icon_state = "panelscorched"
- },
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"ro" = (
/obj/machinery/jukebox,
@@ -6804,7 +6802,7 @@
"sh" = (
/obj/structure/chair/stool,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"si" = (
/obj/effect/turf_decal/tile/bar,
@@ -6863,9 +6861,7 @@
},
/obj/structure/cable,
/turf/open/floor/plasteel,
-/area/xenoarch/bot{
- name = "Demon Teleporter"
- })
+/area/ruin/space/has_grav/powered)
"sx" = (
/obj/structure/fluff/paper,
/obj/structure/filingcabinet,
@@ -6986,9 +6982,9 @@
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
"tz" = (
-/obj/structure/table,
-/turf/open/floor/plasteel/airless,
-/area/xenoarch/caloriteresearch_powered)
+/obj/item/flashlight/lantern,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
"tA" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -7013,7 +7009,7 @@
/obj/structure/table,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"tG" = (
/obj/structure/chair/office,
@@ -7072,9 +7068,7 @@
/area/xenoarch/caloriteresearch_powered)
"uk" = (
/obj/item/shard,
-/turf/open/floor/plating{
- icon_state = "panelscorched"
- },
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"um" = (
/obj/structure/table/wood,
@@ -7086,7 +7080,7 @@
"uq" = (
/obj/structure/table,
/obj/machinery/light/small,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"ur" = (
/obj/item/trash/can,
@@ -7330,7 +7324,7 @@
/area/xenoarch/caloriteresearch_powered)
"wx" = (
/obj/structure/tank_dispenser/oxygen,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"wy" = (
/obj/effect/turf_decal/tile/bar{
@@ -7475,9 +7469,7 @@
mapped_quantum_pads = list("ldemone","demone")
},
/turf/open/floor/plasteel,
-/area/xenoarch/bot{
- name = "Demon Teleporter"
- })
+/area/ruin/space/has_grav/powered)
"xu" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -7673,7 +7665,7 @@
dir = 1;
id = "fatchamber"
},
-/turf/open/floor/plating,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"yN" = (
/obj/structure/closet/secure_closet/personal,
@@ -7709,7 +7701,7 @@
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"yZ" = (
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"za" = (
/obj/structure/table,
@@ -7847,7 +7839,7 @@
"Al" = (
/obj/structure/holosign/barrier/atmos,
/obj/structure/lattice,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_unpowered)
"Aq" = (
/obj/structure/table,
@@ -8083,7 +8075,7 @@
"BG" = (
/obj/structure/chair/sofa/right,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"BK" = (
/obj/structure/window/reinforced{
@@ -8117,9 +8109,8 @@
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
"BV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/airless,
+/obj/structure/girder,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"Cc" = (
/obj/effect/turf_decal/loading_area,
@@ -8228,7 +8219,7 @@
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"CI" = (
/obj/effect/decal/cleanable/dirt,
@@ -8315,7 +8306,7 @@
/area/xenoarch/gen)
"De" = (
/obj/machinery/suit_storage_unit/mining,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"Dg" = (
/obj/structure/lattice,
@@ -8346,7 +8337,7 @@
"Dt" = (
/obj/effect/decal/cleanable/glass,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"DF" = (
/obj/structure/fans/tiny/invisible,
@@ -8417,9 +8408,7 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
-/turf/open/floor/plating{
- icon_state = "platingdmg1"
- },
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_unpowered)
"Em" = (
/obj/effect/turf_decal/tile/bar,
@@ -8436,7 +8425,7 @@
/obj/item/shard{
icon_state = "small"
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"Eq" = (
/obj/structure/rack/shelf,
@@ -8556,7 +8545,7 @@
/obj/structure/window/reinforced/tinted{
dir = 4
},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"Fk" = (
/obj/machinery/iv_drip/feeding_tube,
@@ -9001,10 +8990,6 @@
/obj/machinery/door/airlock/maintenance_hatch,
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
-"IY" = (
-/obj/structure/chair/stool,
-/turf/open/floor/plasteel/airless,
-/area/xenoarch/caloriteresearch_powered)
"IZ" = (
/obj/machinery/light/floor,
/turf/open/floor/pod,
@@ -9070,7 +9055,7 @@
/obj/machinery/microwave{
pixel_y = 6
},
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"Jv" = (
/obj/structure/cable{
@@ -9325,7 +9310,7 @@
/area/xenoarch/caloriteresearch_powered)
"Lj" = (
/obj/structure/closet/secure_closet/miner,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"Lk" = (
/obj/structure/scale,
@@ -9350,12 +9335,6 @@
/obj/item/clothing/glasses/sunglasses/blindfold,
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
-"LF" = (
-/obj/structure/girder,
-/turf/open/floor/plating{
- icon_state = "platingdmg1"
- },
-/area/xenoarch/caloriteresearch_powered)
"LH" = (
/turf/open/floor/mineral/calorite/strong,
/area/xenoarch/caloriteresearch_powered)
@@ -9402,7 +9381,7 @@
/area/xenoarch/caloriteresearch_powered)
"LT" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"LU" = (
/obj/effect/turf_decal/tile/yellow{
@@ -9453,9 +9432,7 @@
/area/xenoarch/caloriteresearch_powered)
"Ml" = (
/obj/structure/girder,
-/turf/open/floor/plating{
- icon_state = "platingdmg1"
- },
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_unpowered)
"Mm" = (
/obj/structure/sink{
@@ -9843,10 +9820,9 @@
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
"Pc" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder,
-/turf/open/floor/plasteel/airless,
-/area/xenoarch/caloriteresearch_powered)
+/obj/structure/lattice,
+/turf/open/floor/plating/lavaland_baseturf,
+/area/xenoarch/caloriteresearch_unpowered)
"Pf" = (
/obj/structure/table,
/obj/item/pen,
@@ -9890,7 +9866,7 @@
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"Pr" = (
/obj/structure/sink{
@@ -10002,12 +9978,8 @@
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
"Qr" = (
-/obj/machinery/conveyor{
- dir = 1;
- id = "fatchamber"
- },
-/turf/open/floor/plating/airless,
-/area/xenoarch/caloriteresearch_powered)
+/turf/open/floor/plating/lavaland_baseturf,
+/area/xenoarch/caloriteresearch_unpowered)
"Qy" = (
/obj/machinery/shower{
pixel_y = 19
@@ -10318,7 +10290,7 @@
/obj/machinery/conveyor{
dir = 6
},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"SF" = (
/obj/effect/turf_decal/tile/neutral{
@@ -10400,7 +10372,7 @@
/area/xenoarch/caloriteresearch_powered)
"Tk" = (
/obj/structure/holosign/barrier/atmos,
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_unpowered)
"Tn" = (
/obj/structure/closet/secure_closet/personal/cabinet,
@@ -10466,7 +10438,7 @@
dir = 2;
id = "fatchamber"
},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"TC" = (
/obj/structure/table/wood,
@@ -10504,7 +10476,7 @@
"TM" = (
/obj/machinery/suit_storage_unit/mining,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"TO" = (
/obj/structure/window/reinforced/tinted{
@@ -10519,7 +10491,7 @@
"TP" = (
/obj/machinery/vending/cigarette,
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"TR" = (
/obj/machinery/light/small{
@@ -10665,7 +10637,7 @@
/area/xenoarch/caloriteresearch_powered)
"Vi" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"Vj" = (
/obj/structure/table/wood,
@@ -10709,7 +10681,7 @@
/obj/machinery/conveyor{
dir = 2
},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"VD" = (
/obj/effect/decal/cleanable/blood/innards{
@@ -10731,7 +10703,8 @@
/turf/open/floor/mineral/calorite,
/area/xenoarch/caloriteresearch_powered)
"VL" = (
-/turf/open/floor/plasteel/airless,
+/obj/structure/window/reinforced/fulltile,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"VN" = (
/obj/effect/turf_decal/stripes{
@@ -10923,7 +10896,7 @@
/area/xenoarch/caloriteresearch_powered)
"Xo" = (
/obj/structure/chair/sofa/left,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"Xq" = (
/obj/machinery/computer/crew{
@@ -11181,7 +11154,7 @@
/obj/item/shard{
icon_state = "medium"
},
-/turf/open/floor/plating,
+/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
"ZC" = (
/obj/machinery/light{
@@ -58125,7 +58098,7 @@ ab
ab
ab
ab
-lQ
+tz
lQ
ab
ab
@@ -58395,7 +58368,7 @@ ab
ab
lQ
lQ
-lQ
+tz
lQ
lQ
BP
@@ -58404,7 +58377,7 @@ ab
ab
lQ
lQ
-lQ
+tz
ab
ab
ab
@@ -61741,7 +61714,7 @@ ab
ab
ab
ab
-lQ
+tz
lQ
lQ
lQ
@@ -62244,7 +62217,7 @@ HJ
Rh
Pv
Pv
-lQ
+tz
ab
ab
BP
@@ -62524,7 +62497,7 @@ yw
ab
ab
lQ
-lQ
+tz
ab
ab
ab
@@ -62730,8 +62703,8 @@ ay
ay
ay
ay
-tZ
-Ou
+Ml
+Qr
OA
xY
Yd
@@ -62987,8 +62960,8 @@ ay
ay
ay
ay
-tZ
-Ou
+Ml
+Qr
HJ
Tj
Cm
@@ -63245,7 +63218,7 @@ ay
ay
FV
Dg
-wF
+Pc
HJ
zz
wI
@@ -63502,7 +63475,7 @@ PJ
Hz
Hz
NN
-Ou
+Qr
HJ
Mn
BL
@@ -63749,17 +63722,17 @@ lQ
lQ
lQ
UO
-tZ
-Ou
-Ou
-Ou
+Ml
+Qr
+Qr
+Qr
Tk
-wF
-Ou
-Ou
-Ou
-Ou
-Ou
+Pc
+Qr
+Qr
+Qr
+Qr
+Qr
HJ
Li
Vh
@@ -64006,8 +63979,8 @@ lQ
lQ
lQ
lQ
-tZ
-tC
+Ml
+Qr
yZ
Gn
OA
@@ -64263,19 +64236,19 @@ lQ
lQ
AQ
lQ
-tC
-tC
+Qr
+Qr
yZ
LT
-NU
+LT
ZA
-yg
+yZ
+yL
+yL
+yL
+yL
+yL
yL
-Qr
-Qr
-Qr
-Qr
-Qr
tH
Vl
MV
@@ -64520,20 +64493,20 @@ lQ
lQ
lQ
lQ
-tC
+Qr
El
yZ
yZ
uk
-SG
-BS
+yZ
+VL
rk
-yg
-Tt
+yZ
+LT
En
-Sj
-yg
-yg
+VL
+yZ
+yZ
Ls
HJ
qt
@@ -64778,8 +64751,8 @@ lQ
lQ
lQ
Ml
-Ou
-Gn
+Qr
+BV
SE
Fj
Vy
@@ -65035,7 +65008,7 @@ Cg
BP
lQ
PJ
-Ou
+Qr
OA
AT
Kt
@@ -65292,7 +65265,7 @@ yw
lQ
lQ
PJ
-Ou
+Qr
Sc
VU
Sj
@@ -65549,7 +65522,7 @@ yw
yw
yw
PJ
-Ou
+Qr
OA
XI
If
@@ -65806,7 +65779,7 @@ yw
yw
yw
PJ
-Ou
+Qr
OA
Sf
Kt
@@ -66063,7 +66036,7 @@ yw
yw
yw
PJ
-Ou
+Qr
RG
zW
Sj
@@ -66320,7 +66293,7 @@ yw
yw
yw
PJ
-Ou
+Qr
OA
EH
BM
@@ -66580,10 +66553,10 @@ PJ
Al
OA
OA
-Gn
-yZ
-yZ
-Gn
+OA
+OA
+OA
+OA
OA
OA
OA
@@ -66838,9 +66811,9 @@ Dg
Dg
Dg
Hz
-Hz
-Hz
-Hz
+Qr
+Qr
+Qr
Oq
Eg
DF
@@ -67649,13 +67622,13 @@ At
Oa
OA
xQ
-CI
-VL
+Tt
+Ls
De
TM
Tj
-VL
-VL
+Ls
+Ls
sh
sh
OA
@@ -67906,14 +67879,14 @@ Zs
Oa
OA
wx
-CI
+Tt
KL
Ys
-CI
+Tt
Tj
Dt
-IY
-tz
+UA
+Cj
uq
OA
ab
@@ -68163,7 +68136,7 @@ Zw
Oa
OA
Pq
-CI
+Tt
Oq
Oq
Oq
@@ -68171,7 +68144,7 @@ Oq
Oq
Oq
Oq
-tz
+Cj
OA
ay
ay
@@ -68420,8 +68393,8 @@ SG
SG
OA
Vi
-CI
-BV
+Tt
+BB
Oq
vC
Tj
@@ -68429,7 +68402,7 @@ KL
qB
Oq
Oq
-LF
+KL
ay
ay
ay
@@ -68678,9 +68651,9 @@ Oa
OA
xQ
Lj
-VL
+Ls
Lj
-CI
+Tt
Tj
BG
AV
@@ -68940,8 +68913,8 @@ OA
OA
OA
CG
-CI
-CI
+Tt
+Tt
TP
OA
lQ
@@ -69197,9 +69170,9 @@ Ve
Xq
Tj
Xo
-CI
-VL
-Pc
+Tt
+Ls
+IE
OA
ab
ab
@@ -69453,10 +69426,10 @@ wR
Oa
On
Tj
-VL
-VL
-VL
-tz
+Ls
+Ls
+Ls
+Cj
OA
ab
ab
@@ -69710,8 +69683,8 @@ wR
It
Oa
OF
-VL
-VL
+Ls
+Ls
tE
Ju
OA
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 14498a98..1df6e5ac 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -356,9 +356,9 @@
else if(M.fatness < FATNESS_LEVEL_EXTREMELY_OBESE)
to_chat(M, "With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.")
else if(M.fatness < FATNESS_LEVEL_BARELYMOBILE)
- to_chat(M, "The world around you blurs as you focus on prodding the statue, your waistline widening further...")
+ to_chat(M, "The world around you blur slightly as you focus on prodding the statue, your waistline widening further...")
else if(M.fatness < FATNESS_LEVEL_IMMOBILE)
- to_chat(M, "A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.")
+ to_chat(M, "A whispering voice gently compliments your massive body, your own mind begging to touch the statue.")
else
to_chat(M, "You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...")
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 03c6eea8..63886e75 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -2520,7 +2520,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
//GS13 fatness
if("fatness")
- var/new_fatness = input(user, "Choose your amount of fat at start :\n(0-4000), Fat changes appearance and move speed. \nThresholds are 200, 440, 1240, 1840 and 3400. Warning : If using the 'weak legs' trait, being too fat will make you immobile and unable to leave the shuttle without a wheelchair or help", "Character Preference") as num|null
+ var/new_fatness = input(user, "Choose your amount of fat at start :\n(0-4000), Fat changes appearance and move speed. \nThresholds are 170, 250, 330, 440, 840, 1240, 1840, 2540, 3440. Warning : If using the 'weak legs' trait, being too fat will make you immobile and unable to leave the shuttle without a wheelchair or help", "Character Preference") as num|null
if (new_fatness)
starting_weight = max(min( round(text2num(new_fatness)), 4000),0)
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 353d8dcf..9ef962ff 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -247,11 +247,6 @@
desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
spawned_disease = /datum/disease/advance/cold
-/obj/item/reagent_containers/glass/bottle/weightgain //GS13
- name = "Weight gain culture bottle"
- desc = "A small bottle. Contains a disease that multiplies victim's adipose."
- spawned_disease = /datum/symptom/weight_gain
-
/obj/item/reagent_containers/glass/bottle/flu_virion
name = "Flu virion culture bottle"
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index b4588c64..37f820fb 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -290,6 +290,18 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous
category = "Conspicuous Weapons"
+/datum/uplink_item/dangerous/fatoray //GS13
+ name = "Fatoray Pistol"
+ desc = "A ray-pistol with capability to fire fattening projectiles, with intention of slowing down your target."
+ item = /obj/item/gun/energy/fatoray
+ cost = 6
+
+/datum/uplink_item/dangerous/fatocannon //GS13
+ name = "Fatoray Cannon"
+ desc = "An energy projectile cannon with capability to fire powerful fattening projectiles, with intention of immobilizing your target."
+ item = /obj/item/gun/energy/fatoray/cannon
+ cost = 8
+
/datum/uplink_item/dangerous/pistol
name = "Stechkin Pistol"
desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible \
@@ -1364,6 +1376,13 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools
category = "Misc. Gadgets"
+
+/datum/uplink_item/device_tools/fatnade //GS13
+ name = "Fattening Grenade"
+ desc = "A smoke grenade with a special caloric mix inside it. Remember to wear internals upon using."
+ item = /obj/item/card/emag
+ cost = 2
+
/datum/uplink_item/device_tools/emag
name = "Cryptographic Sequencer"
desc = "The cryptographic sequencer, electromagnetic card, or emag, is a small card that unlocks hidden functions \
diff --git a/hyperstation/icons/obj/genitals/belly.dmi b/hyperstation/icons/obj/genitals/belly.dmi
index 5a49d985..09f3f9b1 100644
Binary files a/hyperstation/icons/obj/genitals/belly.dmi and b/hyperstation/icons/obj/genitals/belly.dmi differ