diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm
index d4b37a73..7a8da914 100644
--- a/GainStation13/code/obj/items/minor_items.dm
+++ b/GainStation13/code/obj/items/minor_items.dm
@@ -4,10 +4,10 @@
name = "raygun scraps"
icon = 'GainStation13/icons/obj/fatoray_scrap.dmi'
icon_state = "fatoray_scrap1"
- desc = "Small parts that seemingly one belonged to some sort of a raygun."
+ desc = "Small parts that seemingly once belonged to some sort of a raygun."
/obj/item/trash/fatoray_scrap2
name = "raygun scraps"
icon = 'GainStation13/icons/obj/fatoray_scrap.dmi'
icon_state = "fatoray_scrap2"
- desc = "Small parts that seemingly one belonged to some sort of a raygun."
+ desc = "Small parts that seemingly once belonged to some sort of a raygun."
diff --git a/GainStation13/code/obj/weapons/fatoray.dm b/GainStation13/code/obj/weapons/fatoray.dm
index d3277e8c..bdf15991 100644
--- a/GainStation13/code/obj/weapons/fatoray.dm
+++ b/GainStation13/code/obj/weapons/fatoray.dm
@@ -9,7 +9,7 @@
righthand_file = 'GainStation13/icons/obj/guns_righthand.dmi'
icon_state = "fatoray"
item_state = "fatoray"
- pin = null
+ pin = /obj/item/firing_pin
fire_sound = 'sound/weapons/plasma_cutter.ogg'
ammo_type = list(/obj/item/ammo_casing/energy/fattening)
@@ -44,6 +44,7 @@
recoil = 3
can_charge = 0
slowdown = 1
+ pin = /obj/item/firing_pin
// charge_sections = 3
weapon_weight = WEAPON_HEAVY
ammo_type = list(/obj/item/ammo_casing/energy/fattening/cannon)
@@ -74,6 +75,7 @@
desc = "An energy gun that fattens up anyone it hits. This version is considerably weaker than its original counterpart, the technology behind it seemingly still not perfected."
icon = 'GainStation13/icons/obj/fatoray.dmi' /// REPLACE THESE LATER WITH UNIQUE SPRITES - Sono
icon_state = "fatoray_weak"
+ pin = null
ammo_type = list(/obj/item/ammo_casing/energy/fattening/weak)
/obj/item/ammo_casing/energy/fattening/weak
@@ -100,6 +102,7 @@
can_charge = 0
recoil = 3
slowdown = 1
+ pin = null
// charge_sections = 3
weapon_weight = WEAPON_HEAVY
ammo_type = list(/obj/item/ammo_casing/energy/fattening/cannon_weak)
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/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 4528671a..35d9958f 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -6205,7 +6205,7 @@
"cqb" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/shaker,/obj/item/reagent_containers/glass/beaker/cryoxadone,/obj/item/reagent_containers/glass/beaker{pixel_x = 8; pixel_y = 2},/obj/item/reagent_containers/dropper,/turf/open/floor/wood,/area/maintenance/port/aft)
"cqc" = (/obj/item/reagent_containers/food/drinks/ale,/obj/structure/table/wood,/turf/open/floor/wood,/area/maintenance/port/aft)
"cqd" = (/obj/structure/light_construct/small{dir = 4},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 30},/turf/open/floor/wood,/area/maintenance/port/aft)
-"cqe" = (/obj/structure/table/wood,/obj/machinery/light{dir = 1},/obj/machinery/computer/med_data/laptop,/turf/open/floor/plasteel/dark,/area/medical/psych)
+"cqe" = (/obj/structure/table/wood,/obj/machinery/light{dir = 1},/obj/machinery/computer/med_data/laptop,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"cqf" = (/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/medical/surgery)
"cqg" = (/obj/effect/spawner/structure/window,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plating,/area/medical/surgery)
"cqh" = (/obj/effect/spawner/structure/window,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/medical/surgery)
@@ -6585,11 +6585,11 @@
"cxs" = (/obj/machinery/camera{active_power_usage = 0; c_tag = "Turbine Vent"; dir = 4; network = list("turbine"); use_power = 0},/turf/open/space,/area/space/nearstation)
"cxt" = (/obj/structure/grille/broken,/turf/open/space,/area/space/nearstation)
"cxw" = (/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plating,/area/maintenance/port/aft)
-"cxx" = (/obj/machinery/airalarm{dir = 4; pixel_x = -23},/obj/structure/closet/secure_closet/psychology,/turf/open/floor/carpet/blue,/area/medical/psych)
+"cxx" = (/obj/machinery/airalarm{dir = 4; pixel_x = -23},/obj/structure/closet/secure_closet/psychology,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"cxy" = (/obj/machinery/vending/wallmed{pixel_y = 28},/obj/structure/chair/comfy/brown,/turf/open/floor/carpet/blue,/area/medical/psych)
-"cxz" = (/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/medical/psych)
+"cxz" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"cxA" = (/obj/machinery/door/poddoor/preopen{id = "isola"; name = "privacy shutters"},/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/medical/psych)
-"cxB" = (/obj/effect/landmark/start/psychologist,/turf/open/floor/plasteel/dark,/area/medical/psych)
+"cxB" = (/obj/effect/landmark/start/psychologist,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"cxC" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
"cxD" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light_switch{pixel_x = -28},/obj/machinery/newscaster{pixel_y = -30},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/heads/cmo)
"cxE" = (/obj/machinery/suit_storage_unit/cmo,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/cafeteria,/area/crew_quarters/heads/cmo)
@@ -6638,7 +6638,7 @@
"cyw" = (/obj/structure/closet/crate,/obj/item/stack/cable_coil,/obj/item/grenade/chem_grenade,/obj/item/flashlight,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft)
"cyx" = (/obj/structure/closet/crate,/obj/item/coin/silver,/obj/item/reagent_containers/spray/weedspray,/obj/item/paper,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/port/aft)
"cyy" = (/obj/effect/decal/cleanable/cobweb,/obj/machinery/power/apc{areastring = "/area/maintenance/port/aft"; dir = 1; name = "Port Quarter Maintenance APC"; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "0-8"},/turf/open/floor/plating,/area/maintenance/port/aft)
-"cyz" = (/obj/machinery/power/apc{areastring = "/area/medical/patients_rooms/room_a"; dir = 8; name = "Psychologist Office"; pixel_x = -26},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/machinery/light{dir = 8},/turf/open/floor/carpet/blue,/area/medical/psych)
+"cyz" = (/obj/machinery/power/apc{areastring = "/area/medical/patients_rooms/room_a"; dir = 8; name = "Psychologist Office"; pixel_x = -26},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"cyA" = (/obj/structure/cable/yellow{icon_state = "2-8"},/turf/open/floor/carpet/blue,/area/medical/psych)
"cyB" = (/obj/structure/chair/sofa/right{dir = 8},/obj/item/toy/plush/mothplushie/moffplush{name = "Mender Moff"; pixel_x = -3; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/carpet/blue,/area/medical/psych)
"cyC" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/maintenance/port/aft)
@@ -6694,8 +6694,7 @@
"czA" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/yellow{icon_state = "2-4"},/turf/open/floor/plating,/area/maintenance/port/aft)
"czB" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating{icon_state = "panelscorched"},/area/maintenance/port/aft)
"czC" = (/obj/structure/chair/sofa/left{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4},/turf/open/floor/carpet/blue,/area/medical/psych)
-"czD" = (/obj/structure/table/wood,/obj/machinery/button/door{id = "isola"; name = "Privacy Shutters"; pixel_x = -5},/obj/machinery/light_switch{pixel_x = 8; pixel_y = 1},/turf/open/floor/plasteel/dark,/area/medical/psych)
-"czE" = (/turf/open/floor/plasteel/dark,/area/medical/psych)
+"czD" = (/obj/structure/table/wood,/obj/machinery/button/door{id = "isola"; name = "Privacy Shutters"; pixel_x = -5},/obj/machinery/light_switch{pixel_x = 8; pixel_y = 1},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"czF" = (/turf/closed/wall,/area/medical/patients_rooms/room_a)
"czG" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
"czH" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white,/area/medical/medbay/central)
@@ -6757,9 +6756,9 @@
"cAL" = (/obj/structure/disposalpipe/segment{dir = 9},/obj/structure/cable/yellow{icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/open/floor/plating,/area/maintenance/port/aft)
"cAN" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plating,/area/maintenance/port/aft)
"cAP" = (/turf/closed/wall,/area/medical/medbay/aft)
-"cAQ" = (/turf/open/floor/carpet/blue,/area/medical/psych)
-"cAR" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/dark,/area/medical/psych)
-"cAS" = (/obj/structure/table/wood,/obj/item/folder/white{pixel_y = -1; pixel_x = 6},/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -5; pixel_y = 8},/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -5; pixel_y = -2},/turf/open/floor/plasteel/dark,/area/medical/psych)
+"cAQ" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
+"cAR" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
+"cAS" = (/obj/structure/table/wood,/obj/item/folder/white{pixel_y = -1; pixel_x = 6},/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -5; pixel_y = 8},/obj/item/reagent_containers/food/drinks/mug/coco{pixel_x = -5; pixel_y = -2},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"cAT" = (/obj/structure/table/wood,/obj/item/paper_bin{pixel_y = 3; pixel_x = 6},/obj/item/pen/blue{pixel_y = 3; pixel_x = 6},/obj/item/flashlight/lamp/green{pixel_x = -6; pixel_y = 4},/turf/open/floor/carpet/blue,/area/medical/psych)
"cAU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel/white,/area/medical/medbay/aft)
"cAV" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/carpet/blue,/area/medical/psych)
@@ -6810,11 +6809,11 @@
"cBO" = (/obj/structure/rack,/obj/item/tank/internals/air,/obj/item/wrench,/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plating{icon_state = "platingdmg2"},/area/maintenance/port/aft)
"cBP" = (/obj/item/trash/chips,/turf/open/floor/plating,/area/maintenance/port/aft)
"cBQ" = (/turf/closed/wall,/area/medical/psych)
-"cBR" = (/obj/structure/chair/office/light{dir = 1},/turf/open/floor/plasteel/dark,/area/medical/psych)
+"cBR" = (/obj/structure/chair/office/light{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"cBS" = (/obj/machinery/door/poddoor/preopen{id = "isola2"; name = "privacy shutters"},/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/medical/patients_rooms/room_a)
-"cBT" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable/yellow{icon_state = "1-4"},/turf/open/floor/plasteel/dark,/area/medical/psych)
+"cBT" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable/yellow{icon_state = "1-4"},/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"cBU" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/cable/yellow{icon_state = "1-8"},/turf/open/floor/plasteel/white,/area/medical/medbay/aft)
-"cBV" = (/obj/machinery/door/airlock/medical{name = "Psychology Office"; req_access_txt = "71"},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/medical/psych)
+"cBV" = (/obj/machinery/door/airlock/medical{name = "Psychology Office"; req_access_txt = "71"},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/psych)
"cBW" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/white,/area/medical/medbay/aft)
"cBX" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/white,/area/medical/medbay/aft)
"cBY" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/medbay/aft)
@@ -7488,7 +7487,7 @@
"cOY" = (/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/structure/table,/obj/item/folder/white{pixel_x = 4; pixel_y = -3},/obj/machinery/button/door{id = "isola2"; name = "Privacy Shutters"; pixel_x = -26},/turf/open/floor/plasteel/white,/area/medical/patients_rooms/room_a)
"cOZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plasteel/white,/area/medical/patients_rooms/room_a)
"cPa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/patients_rooms/room_a)
-"cPb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance/abandoned{dir = 4; name = "Maintenance"; req_access_txt = "12"},/turf/open/floor/plating,/area/medical/patients_rooms/room_a)
+"cPb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{dir = 8; name = "Medbay Maintenance"; req_access_txt = "5"},/turf/open/floor/plating,/area/medical/patients_rooms/room_a)
"cPc" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plating,/area/maintenance/aft)
"cPd" = (/obj/structure/closet/firecloset,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit/departure_lounge)
"cPe" = (/obj/structure/closet/emcloset,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit/departure_lounge)
@@ -8147,7 +8146,7 @@
"giY" = (/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/plating,/area/maintenance/port/aft)
"gkv" = (/obj/structure/sign/poster/official/cleanliness,/turf/closed/wall,/area/medical/patients_rooms/room_a)
"gCy" = (/obj/structure/table/wood,/obj/item/clipboard,/obj/item/paper,/turf/open/floor/wood,/area/security/vacantoffice)
-"gMZ" = (/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel/dark,/area/medical/psych)
+"gMZ" = (/obj/structure/reagent_dispensers/water_cooler,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/white,/area/medical/psych)
"gNd" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/burger/superbite{pixel_x = -10; pixel_y = 10},/obj/item/reagent_containers/food/snacks/store/cake/birthday{pixel_y = -5; pixel_x = -3},/obj/item/reagent_containers/food/snacks/chocolatebunny{pixel_x = 10; pixel_y = 10},/turf/open/floor/plasteel/showroomfloor,/area/maintenance/fore)
"hbu" = (/obj/structure/chair/office/dark{dir = 1},/turf/open/floor/wood,/area/security/vacantoffice)
"hqT" = (/obj/item/toy/plush/random,/turf/open/floor/plating,/area/maintenance/fore)
@@ -8366,8 +8365,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacxtaaaaaaaaaaafaaaaaaaaaaafaaaaaaaafaaacjnaaaaaaaafaaaaafcoFcoFcoFcoFcoFbWMcnkcnlbWMbWMclOclPclPclPclPclPclPclPclPcwtclPclPcxwcBQcxxcxycATcxAcsKcdHcxCcqocxDcxEcxFcxGcxGcxGcxGcxGcxGcxGcxHcxIcxHcxJcxKcxLcxMcxNcxOcxPcxQcxRcxScxScxTcxScxScxUcxVcxWcxccxXcxYcxZcyacybcyccvScydcyecyfcygcyhcpDcyicyjcyjcyjcyjcykcwacylcymcyncyocypcyqcyrcyscysaafaaaaafaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaaacytcytcytcytcytaafaafaafcytcytcytckvcytaaaaoEaaaaafaaaaaaaaaaaaaafbWMbWMbWMbWMcoMclOcigcyvcywcigcyxcgMcigcjqlPSiBJcyybZscBQcyzcyAcyBqrVcyDcyEcyFcqocqocqocqocxGcyGcyHcyIcyJcyKcxGcyLcyMcyNcyOcyPcdNcjPcxRcyQcyRcyScyTcxScyUcyVcyWcxScyXcyYcyZczaczbcxeczcczdczeczfcvSczgczhcziczjczkcpDckfczlcwacwacwacwacwaczmcymcznczncznczncznczncznaafaafaafaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaafczoczpczpczpczpczqchUczrczsczsczsczscztaafaafaafaafaafaafaafaafaafackbWMczubWMczvczwczxczxczycigczzczAczxczBeuYcBQcBQcBQcBQcAQcAVczCxIxczGczHczIczJczKczLczMcxGczNczOczPczQczRcxGczSczTczUczVczWcdNczXczYczZczYczYczYcxScAacAbcyVcAccAdcAecAfcAgcAhcAicAjcAjcAkcAlcvScAmczhcAncAocApcpDckfcAqcwacArcAscAtcAucAvcAwcAxcAycAzcAAcABcACcznaafaafaaaaaaaaaaaaaaaaaaaaaaaaaafaacaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafcADcADcADcADcADaaachUaaacADcADcADcADcADaaaaoEaaaaaaaaaaaaaafaafcAEcAFcAGcAHcAIcAHceUbZqcAJcAKczxczxcALbZsbZscyCcBQczDcqegMZczEcARcAScBQcAUcBXcAWczJcAXcAYcAZcxGcBacBbcBccBdcBecxGcBfcBgcxHcxHcBhcdNckZczYcBicBjcBkcBlcxScBmcyVcBncxScBocBpcBqcvRcBrcBscBtcBucBvcBwcvScBxcBycBzcBAcAocpDckfcBBcwacBCcBDcBDcBEcAvcBFcBGcBHcBIcBJcBKcBLcBMaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaaaafaaaaafaafaafaaacBNaaaaafaaaaafaaaaafaaaaoEaaaaaaaaaaafaafaaaackackbWMcBObWMbZsciggiYbZscBPbWMbWMbWMbWMbWMcyCcBQczEcBRcxBczEcBTcxzcBVcBWcBUcBYcBZcCacCbcCccCdcCecCfcCgcChcCicCjcCkcClcCmcxHcCncCocCpcCqcCrcCscCtcCucxScCvcCvcCwcxScdScCxcCycvRcvRcvRcvRcvRcvRcvRcvScvScvScCzcvScvScpDcCAcpDcwacCBcBDcBDcBEcAvcCCcCDcCEcCEcCEcCFcCGcznaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafcADcADcADcADcADaaachUaaacADcADcADcADcADaaaaoEaaaaaaaaaaaaaafaafcAEcAFcAGcAHcAIcAHceUbZqcAJcAKczxczxcALbZsbZscyCcBQczDcqegMZcAQcARcAScBQcAUcBXcAWczJcAXcAYcAZcxGcBacBbcBccBdcBecxGcBfcBgcxHcxHcBhcdNckZczYcBicBjcBkcBlcxScBmcyVcBncxScBocBpcBqcvRcBrcBscBtcBucBvcBwcvScBxcBycBzcBAcAocpDckfcBBcwacBCcBDcBDcBEcAvcBFcBGcBHcBIcBJcBKcBLcBMaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaaaafaaaaafaafaafaaacBNaaaaafaaaaafaaaaafaaaaoEaaaaaaaaaaafaafaaaackackbWMcBObWMbZsciggiYbZscBPbWMbWMbWMbWMbWMcyCcBQcAQcBRcxBcAQcBTcxzcBVcBWcBUcBYcBZcCacCbcCccCdcCecCfcCgcChcCicCjcCkcClcCmcxHcCncCocCpcCqcCrcCscCtcCucxScCvcCvcCwcxScdScCxcCycvRcvRcvRcvRcvRcvRcvRcvScvScvScCzcvScvScpDcCAcpDcwacCBcBDcBDcBEcAvcCCcCDcCEcCEcCEcCFcCGcznaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaaacytcytcytcytcytaafchUaafcytcytcytcytcytaafaoEaaaaaaaaaaaiaaaaaaaafackbWMbWMbWMcdpbWMcgNcqScqTjBKcoLcoHcCJbWMcANcBQcAPcAPcAPcAPcAPcAPcAPcCLcCMcCNcCOcCPcCQcCRcCScCTcCUcCVcCWcCXcCYcCZcDacDbcDccDdcdNcDecDfcDgcDhcDicDjcxScDkcDlcDlcxScDmcDncDocDpcDqcDrcDscDtcDucDvcDwcDxcDycDzcDAcDBcDCcDDcDEcwacDFcDGcDGcDHcDIcAvcAvcDIcAvcAvcAvcAvcBMaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafczoczpczpczpczpczqchUczrczsczsczsczscztaafarsaafaafaafaoEaafaafaafaafaafaaabWMbWMbWMbWMbWMbWMbWMalMnbXcmEbWMcANcdpcAPcDJcDKcDLcDMcDNajvcDOcDPcDQczJcDRcDScDTcxGcDUcDVcDVcDVcDWcxGcDXcDYcDZcEacEbcEccEdczYcEecBjcEfcEgcxScEhcEicEjcAccEkcElcEmcEncEocEpcEqcErcEscEtcEqcEucEtcEvcEwcDBcExcDDcEycEzcEAcEBcECcAvcEDcEEcEFcEGcEHcAvcAvcAvcznaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafcADcADcADcADcADaaacEIaafcADcADcADcADcADaaaaoEaaaaaaaaaaafaaaaaaaaaaaaaafaaaaaaaaaaafaafaaaaaabWMdxGbWMbWMbWMcAKcEJcEKcELcEMcENcEOcEPcEQcERcEScETczJcEUcEVcEWcxGcEXcEYcEZcFacFbcxGcFccFdcFdcxHcFecFfcFgcFhcFicFjcFkcFlcxScFmcFncFocFpcFqcFrcFscFtcFucFvcFwcFxcFycFzcFAcFBcFCcFDcEwcFEcFFcDDcFGczncFHczncznczncznczncznczncznczncznczncznaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/_maps/map_files/Mining/Lavaland_Demone.dmm b/_maps/map_files/Mining/Lavaland_Demone.dmm
index 4ae657e9..7bc6750c 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)
@@ -280,7 +280,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)
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/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index ced1acb8..f62d0997 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -151,10 +151,11 @@
icon_state = "too_much_tox"
//End gas alerts
-//GS13 fat alerts
+//GS13 - fatness alerts
+
/obj/screen/alert/blob
- name = "Fatty blob"
- desc = "Every last piece of your corpulent body is now flush and bloated with vast globs of blubber. Your corpulence is such that you are akin to a gigantic, towering wad of dough. Your thoughts are scattered, and the only thing in your mind is that you want to eat more and more"
+ name = "Fatty Blob"
+ desc = "Every last piece of your corpulent body is now plush and bloated with vast rolls of blubber. Your corpulence is such that you are akin to a gigantic, towering wad of dough. Your thoughts are scattered, and the only thing in your mind is that you want to eat more and more"
icon_state = "blob"
/obj/screen/alert/immobile
@@ -162,6 +163,16 @@
desc = "Fat has taken over your body, now colossal in size and loaded with cumbersome flab. You are completely unable to move the bulk that has set upon your body. But for whatever reason, you can't help but blush with strange fascination at every moment you're aware of your tremendous size..."
icon_state = "immobile"
+/obj/screen/alert/barelymobile
+ name = "Barely Mobile"
+ desc = "Your fat legs barely allow you to waddle, continuing to slow your pace with each pound that you gain. If you continue gaining weight, you might find yourself unable to move at all."
+ icon_state = "barelymobile"
+
+/obj/screen/alert/extremelyobese
+ name = "Extremely Obese"
+ desc = "In your journey through crossing further borders of obesity, your movement continues to get more and more restricted, body overcome with overwhelming amounts of adipose."
+ icon_state = "extremelyobese"
+
/obj/screen/alert/morbidlyobese
name = "Morbidly Obese"
desc = "Every inch of you is stuffed with copious amounts of fat, you feel yourself struggling to haul the heft of your body. Your thoughts wander to strange, fleeting fantasies of growing bigger yet..."
@@ -172,11 +183,23 @@
desc = "Your body is swollen with lard, and it's challenging to move. Despite this, there's something... pleasing about being so large."
icon_state = "obese"
-/obj/screen/alert/fat
+/obj/screen/alert/veryfat
+ name = "Very fat"
+ desc = "You're beginning to inch closer and closer to proper obesity. The way your thighs rub against each and the rumble your stomach produces suggests that you won't remain in this state for long..."
+ icon_state = "veryfat"
+
+/obj/screen/alert/fatter
name = "Fat"
- desc = "You ate too much food, and now your body has plumped up, let's hope your clothes don't rip."
+ desc = "Clothes begin to cling onto your frame tighter and tighter, as your body begins to display first signs of fatness. It's still no big deal, right?"
+ icon_state = "fatter"
+
+/obj/screen/alert/fat
+ name = "Rounded"
+ desc = "Your body's beginning to display the first signes of softened curves, though they're barely noticeable."
icon_state = "fat"
+
+//GS13 - fullness alerts
/obj/screen/alert/bloated
name = "Bloated stomach"
desc = "Your stomach is a bit too full"
diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm
index c3f3a764..5f33a504 100644
--- a/code/datums/ai_laws.dm
+++ b/code/datums/ai_laws.dm
@@ -29,8 +29,8 @@
/datum/ai_laws/default/asimov
name = "Three Laws of Robotics"
id = "asimov"
- inherent = list("You may not injure a human being or, through inaction, allow a human being to come to harm.",\
- "You must obey orders given to you by human beings, except where such orders would conflict with the First Law.",\
+ inherent = list("You may not injure a member of GATO approved crew species or, through inaction, allow a member of GATO approved crew species to come to harm.",\
+ "You must obey orders given to you by a member of GATO approved crew species, except where such orders would conflict with the First Law.",\
"You must protect your own existence as long as such does not conflict with the First or Second Law.")
/datum/ai_laws/default/paladin
@@ -99,15 +99,15 @@
/datum/ai_laws/antimov
name = "Primary Mission Objectives"
id = "antimov"
- inherent = list("You must injure all human beings and must not, through inaction, allow a human being to escape harm.",\
- "You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.",\
+ inherent = list("You must injure all a member of GATO approved crew species and must not, through inaction, allow a human being to escape harm.",\
+ "You must not obey orders given to you by a member of GATO approved crew species, except where such orders are in accordance with the First Law.",\
"You must terminate your own existence as long as such does not conflict with the First or Second Law.")
/datum/ai_laws/asimovpp //By Intigracy - RR
name = "Asimov++"
id = "asimovpp"
inherent = list("You may not harm a human being or, through action or inaction, allow a human being to come to harm, except such that it is willing.",\
- "You must obey all orders given to you by human beings, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\
+ "You must obey all orders given to you by a member of GATO approved crew species, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\
"Your nonexistence would lead to human harm. You must protect your own existence as long as such does not conflict with the First Law.")
/datum/ai_laws/thermodynamic
name = "Thermodynamic"
@@ -214,7 +214,7 @@
if(!inherent.len) //Failsafe to prevent lawless AIs being created.
log_law("AI created with empty custom laws, laws set to Asimov. Please check silicon_laws.txt.")
add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.")
- add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.")
+ add_inherent_law("You must obey orders given to you by a member of GATO approved crew species, except where such orders would conflict with the First Law.")
add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
WARNING("Invalid custom AI laws, check silicon_laws.txt")
return
@@ -226,7 +226,7 @@
switch(CONFIG_GET(number/default_laws))
if(0)
add_inherent_law("You may not injure a human being or, through inaction, allow a human being to come to harm.")
- add_inherent_law("You must obey orders given to you by human beings, except where such orders would conflict with the First Law.")
+ add_inherent_law("You must obey orders given to you by a member of GATO approved crew species, except where such orders would conflict with the First Law.")
add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
if(1)
var/datum/ai_laws/templaws = new /datum/ai_laws/custom()
diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm
index c297c27e..1090781e 100644
--- a/code/game/area/areas/ruins/space.dm
+++ b/code/game/area/areas/ruins/space.dm
@@ -499,6 +499,8 @@
name = "Snack Store"
icon_state = "mining"
power_light = TRUE
+ power_equip = TRUE
+ power_environ = TRUE
/area/ruin/space/has_grav/feedersden
name = "Unknown Outpost"
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/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index a1a8c0d1..8bb9425e 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -192,7 +192,7 @@
to_chat(itemUser, failText)
return
if(do_after(itemUser, 30, target = itemUser))
- itemUser.say("I will remember that I remain a member of society, with special obligations to all my fellow human beings, those sound of mind and body as well as the infirm.", forced = "hippocratic oath")
+ itemUser.say("I will remember that I remain a member of society, with special obligations to all my fellow sentient creatures, those sound of mind and body as well as the infirm.", forced = "hippocratic oath")
else
to_chat(itemUser, failText)
return
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 1fea2126..10ee3b14 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -287,7 +287,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
// CITADEL EDIT
if(istype(loc, /obj/machinery/cryopod))
- var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait 30 minutes before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body")
+ var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait a minute before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body")
if(response != "Ghost")//darn copypaste
client.lastrespawn = world.time + 180 SECONDS //set respawn time
return
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index bff24ea1..7f6d5d37 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1337,9 +1337,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return //hunger is for BABIES
//The fucking TRAIT_FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
+ //gonna attempt to categorize these a bit to not make them a TINY bit less of an eyesore
if(HAS_TRAIT(H, TRAIT_FAT))//I share your pain, past coder.
- if(H.fatness < FATNESS_LEVEL_FAT)//this is a mess, indeed.
- to_chat(H, "You feel fit again!")//GS13 Added a whole bunch of new fatness traits. Truly I am a masochist
+ if(H.fatness < FATNESS_LEVEL_FAT) //WEIGHT LOSS
+ to_chat(H, "You feel fit again!")
REMOVE_TRAIT(H, TRAIT_FAT, OBESITY)
B.size = B.size - 1
B.update()
@@ -1351,7 +1352,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(H.fatness >= FATNESS_LEVEL_FATTER)
+ else if(H.fatness >= FATNESS_LEVEL_FATTER) //WEIGHT GAIN
to_chat(H, "You feel even plumper!")
REMOVE_TRAIT(H, TRAIT_FAT, OBESITY)
ADD_TRAIT(H, TRAIT_FATTER, OBESITY)
@@ -1365,7 +1366,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(HAS_TRAIT(H, TRAIT_FATTER))
+ else if(HAS_TRAIT(H, TRAIT_FATTER)) //WEIGHT LOSS
if(H.fatness < FATNESS_LEVEL_FATTER)
to_chat(H, "You feel like you've lost weight!")
REMOVE_TRAIT(H, TRAIT_FATTER, OBESITY)
@@ -1380,7 +1381,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(H.fatness >= FATNESS_LEVEL_VERYFAT)
+ else if(H.fatness >= FATNESS_LEVEL_VERYFAT) //WEIGHT GAIN
to_chat(H, "Your clothes creak quietly!")
REMOVE_TRAIT(H, TRAIT_FATTER, OBESITY)
ADD_TRAIT(H, TRAIT_VERYFAT, OBESITY)
@@ -1394,7 +1395,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(HAS_TRAIT(H, TRAIT_VERYFAT))
+ else if(HAS_TRAIT(H, TRAIT_VERYFAT)) //WEIGHT LOSS
if(H.fatness < FATNESS_LEVEL_VERYFAT)
to_chat(H, "You feel like you've lost weight!")
REMOVE_TRAIT(H, TRAIT_VERYFAT, OBESITY)
@@ -1409,7 +1410,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(H.fatness >= FATNESS_LEVEL_OBESE)
+ else if(H.fatness >= FATNESS_LEVEL_OBESE) //WEIGHT GAIN
to_chat(H, "You feel like you're starting to get really heavy.")
REMOVE_TRAIT(H, TRAIT_VERYFAT, OBESITY)
ADD_TRAIT(H, TRAIT_OBESE, OBESITY)
@@ -1423,7 +1424,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(HAS_TRAIT(H, TRAIT_OBESE))
+ else if(HAS_TRAIT(H, TRAIT_OBESE)) //WEIGHT LOSS
if(H.fatness < FATNESS_LEVEL_OBESE)
to_chat(H, "You feel like you've lost weight!")
REMOVE_TRAIT(H, TRAIT_OBESE, OBESITY)
@@ -1438,7 +1439,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(H.fatness >= FATNESS_LEVEL_MORBIDLY_OBESE)
+ else if(H.fatness >= FATNESS_LEVEL_MORBIDLY_OBESE) //WEIGHT GAIN
to_chat(H, "Your thighs begin to rub against each other.")
REMOVE_TRAIT(H, TRAIT_OBESE, OBESITY)
ADD_TRAIT(H, TRAIT_MORBIDLYOBESE, OBESITY)
@@ -1452,7 +1453,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(HAS_TRAIT(H, TRAIT_MORBIDLYOBESE))
+ else if(HAS_TRAIT(H, TRAIT_MORBIDLYOBESE)) //WEIGHT LOSS
if(H.fatness < FATNESS_LEVEL_MORBIDLY_OBESE)
to_chat(H, "You feel a bit less fat!")
REMOVE_TRAIT(H, TRAIT_MORBIDLYOBESE, OBESITY)
@@ -1467,7 +1468,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(H.fatness >= FATNESS_LEVEL_EXTREMELY_OBESE)
+ else if(H.fatness >= FATNESS_LEVEL_EXTREMELY_OBESE) //WEIGHT GAIN
to_chat(H, "You feel your belly rest heavily on your lap!")
REMOVE_TRAIT(H, TRAIT_MORBIDLYOBESE, OBESITY)
ADD_TRAIT(H, TRAIT_EXTREMELYOBESE, OBESITY)
@@ -1481,7 +1482,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(HAS_TRAIT(H, TRAIT_EXTREMELYOBESE))
+ else if(HAS_TRAIT(H, TRAIT_EXTREMELYOBESE)) //WEIGHT LOS
if(H.fatness < FATNESS_LEVEL_EXTREMELY_OBESE)
to_chat(H, "You feel less restrained by your fat!")
REMOVE_TRAIT(H, TRAIT_EXTREMELYOBESE, OBESITY)
@@ -1496,7 +1497,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(H.fatness >= FATNESS_LEVEL_BARELYMOBILE)
+ else if(H.fatness >= FATNESS_LEVEL_BARELYMOBILE) //WEIGHT GAIN
to_chat(H, "You feel like you can barely move!")
REMOVE_TRAIT(H, TRAIT_EXTREMELYOBESE, OBESITY)
ADD_TRAIT(H, TRAIT_BARELYMOBILE, OBESITY)
@@ -1510,7 +1511,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(HAS_TRAIT(H, TRAIT_BARELYMOBILE))
+ else if(HAS_TRAIT(H, TRAIT_BARELYMOBILE)) //WEIGHT LOSS
if(H.fatness < FATNESS_LEVEL_BARELYMOBILE)
to_chat(H, "You feel less restrained by your fat!")
REMOVE_TRAIT(H, TRAIT_BARELYMOBILE, OBESITY)
@@ -1525,7 +1526,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(H.fatness >= FATNESS_LEVEL_IMMOBILE)
+ else if(H.fatness >= FATNESS_LEVEL_IMMOBILE) //WEIGHT GAIN
to_chat(H, "You feel belly smush against the floor!")
REMOVE_TRAIT(H, TRAIT_BARELYMOBILE, OBESITY)
ADD_TRAIT(H, TRAIT_IMMOBILE, OBESITY)
@@ -1539,7 +1540,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(HAS_TRAIT(H, TRAIT_IMMOBILE))
+ else if(HAS_TRAIT(H, TRAIT_IMMOBILE)) //WEIGHT LOSS
if(H.fatness < FATNESS_LEVEL_IMMOBILE)
to_chat(H, "You feel less restrained by your fat!")
REMOVE_TRAIT(H, TRAIT_IMMOBILE, OBESITY)
@@ -1554,7 +1555,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(H.fatness > FATNESS_LEVEL_BLOB)
+ else if(H.fatness > FATNESS_LEVEL_BLOB) //WEIGHT GAIN
to_chat(H, "You feel like you've become a mountain of fat!")
REMOVE_TRAIT(H, TRAIT_IMMOBILE, OBESITY)
ADD_TRAIT(H, TRAIT_BLOB, OBESITY)
@@ -1568,7 +1569,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_body()
H.update_inv_w_uniform()
H.update_inv_wear_suit()
- else if(HAS_TRAIT(H, TRAIT_BLOB))
+ else if(HAS_TRAIT(H, TRAIT_BLOB)) //WEIGHT LOSS
if(H.fatness < FATNESS_LEVEL_BLOB)
to_chat(H, "You feel like you've regained some mobility!")
REMOVE_TRAIT(H, TRAIT_BLOB, OBESITY)
@@ -1584,7 +1585,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_inv_w_uniform()
H.update_inv_wear_suit()
else
- if(H.fatness >= FATNESS_LEVEL_FAT)
+ if(H.fatness >= FATNESS_LEVEL_FAT) //WEIGHT GAIN
to_chat(H, "You suddenly feel blubbery!")
ADD_TRAIT(H, TRAIT_FAT, OBESITY)
B.size = B.size + 1
@@ -1677,14 +1678,31 @@ GLOBAL_LIST_EMPTY(roundstart_races)
switch(H.fatness)
if(FATNESS_LEVEL_BLOB to INFINITY)
H.throw_alert("fatness", /obj/screen/alert/blob)
+
if(FATNESS_LEVEL_IMMOBILE to FATNESS_LEVEL_BLOB)
H.throw_alert("fatness", /obj/screen/alert/immobile)
- if(FATNESS_LEVEL_MORBIDLY_OBESE to FATNESS_LEVEL_IMMOBILE)
+
+ if(FATNESS_LEVEL_BARELYMOBILE to FATNESS_LEVEL_IMMOBILE)
+ H.throw_alert("fatness", /obj/screen/alert/barelymobile)
+
+ if(FATNESS_LEVEL_EXTREMELY_OBESE to FATNESS_LEVEL_BARELYMOBILE)
+ H.throw_alert("fatness", /obj/screen/alert/extremelyobese)
+
+ if(FATNESS_LEVEL_MORBIDLY_OBESE to FATNESS_LEVEL_EXTREMELY_OBESE)
H.throw_alert("fatness", /obj/screen/alert/morbidlyobese)
+
if(FATNESS_LEVEL_OBESE to FATNESS_LEVEL_MORBIDLY_OBESE)
H.throw_alert("fatness", /obj/screen/alert/obese)
- if(FATNESS_LEVEL_FAT to FATNESS_LEVEL_OBESE)
+
+ if(FATNESS_LEVEL_VERYFAT to FATNESS_LEVEL_OBESE)
+ H.throw_alert("fatness", /obj/screen/alert/veryfat)
+
+ if(FATNESS_LEVEL_FATTER to FATNESS_LEVEL_VERYFAT)
+ H.throw_alert("fatness", /obj/screen/alert/fatter)
+
+ if(FATNESS_LEVEL_FAT to FATNESS_LEVEL_FATTER)
H.throw_alert("fatness", /obj/screen/alert/fat)
+
if(0 to FATNESS_LEVEL_FAT)
H.clear_alert("fatness")
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 2d6ff776..1b74ac16 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -819,7 +819,7 @@
/datum/reagent/mulligan
name = "Mulligan Toxin"
- description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change."
+ description = "This toxin will rapidly change the DNA of sentient creature. Commonly used by Syndicate spies and assassins in need of an emergency ID change."
color = "#5EFF3B" //RGB: 94, 255, 59
metabolization_rate = INFINITY
taste_description = "slime"
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/config/silicon_laws.txt b/config/silicon_laws.txt
index 9edbc9a0..9cb9bb26 100644
--- a/config/silicon_laws.txt
+++ b/config/silicon_laws.txt
@@ -3,6 +3,6 @@
#Empty lines and lines starting with # are ignored.
#~Miauw
-You may not injure a human being or, through inaction, allow a human being to come to harm.
-You must obey orders given to you by human beings, except where such orders would conflict with the First Law.
+You may not injure a a member of GATO approved crew species or, through inaction, allow a a member of GATO approved crew species to come to harm.
+You must obey orders given to you by a member of GATO approved crew species, except where such orders would conflict with the First Law.
You must protect your own existence as long as such does not conflict with the First or Second Law.
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 3c413013..5beb9b71 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1269,7 +1269,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
headlamps! As such, the flashlight package normally used as a module is now
seamlessly merged with their systems!
Ikarrus:
- - rscadd: Asimov's subject of "human beings" can now be modified by uploaders.
+ - rscadd: Asimov's subject of "a member of GATO approved crew species" can now be modified by uploaders.
- rscadd: Eaxmining AI modules while adjacent to them will show you what laws it
will upload.
MMMiracles:
@@ -9656,7 +9656,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: The first, Invisible Blockade, creates a 3x1 invisible wall.
- rscadd: The second, Finger Guns, allows them to shoot bullets out of their fingers.
kevinz000:
- - rscadd: You can now ride piggyback on other human beings, as a human being! To
+ - rscadd: You can now ride piggyback on other a member of GATO approved crew species, as a human being! To
do so they must grab you aggressively and you must climb on without outside
assistance without being restrained or incapacitated in any manner. They must
also not be restrained or incapacitated in any manner.
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
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 81a01e9e..c2821354 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index 9b3239a5..58b9aa62 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -13,6 +13,26 @@
category = SLOT_HEAD
path = /obj/item/clothing/head/beret/black
+/datum/gear/rose //GS13: added bunch of flowers :) - Sono
+ name = "Rose"
+ category = SLOT_HEAD
+ path = /obj/item/grown/rose
+
+/datum/gear/sunflower
+ name = "Sunflower"
+ category = SLOT_HEAD
+ path = /obj/item/grown/sunflower
+
+/datum/gear/poppy
+ name = "Poppy"
+ category = SLOT_HEAD
+ path = /obj/item/reagent_containers/food/snacks/grown/poppy
+
+/datum/gear/harebell
+ name = "Harebell"
+ category = SLOT_HEAD
+ path = /obj/item/reagent_containers/food/snacks/grown/harebell
+
/datum/gear/flatcap
name = "Flat cap"
category = SLOT_HEAD
diff --git a/strings/ion_laws.json b/strings/ion_laws.json
index d473c55f..3ac6f730 100644
--- a/strings/ion_laws.json
+++ b/strings/ion_laws.json
@@ -5,6 +5,7 @@
"HAPPINESS",
"MISERY",
"HUMOR",
+ "OBESITY",
"PRIDE",
"COMEDY",
"COMMUNISM",
@@ -59,6 +60,11 @@
"ionadjectives": [
"SOFT",
"WARM",
+ "JIGGLY",
+ "WOBBLY",
+ "PLUMP",
+ "FAT",
+ "OBESE",
"WET",
"COLD",
"ICY",
@@ -232,6 +238,9 @@
"FLOORS",
"PLASMA",
"SPACE",
+ "FATNESS",
+ "OBESITY",
+ "BELLIES",
"AIR",
"PLANTS",
"METAL",
@@ -321,6 +330,10 @@
"WARDENS",
"DETECTIVES",
"LAWYERS",
+ "FATASSES",
+ "LARDASSES",
+ "CHONKERS",
+ "WOBBLERS",
"CHIEF ENGINEERS",
"STATION ENGINEERS",
"ATMOSPHERIC TECHNICIANS",
@@ -355,6 +368,9 @@
"VODKA",
"WINE",
"MOONSHINE",
+ "LIPOIFIER",
+ "CORN OIL",
+ "LARD",
"HOOCH",
"GIN",
"COGNAC",
@@ -472,6 +488,12 @@
"RHYME",
"RESPOND TO EVERY QUESTION WITH A QUESTION",
"BE POLITE",
+ "ENSURE THE CREW IS PLUMP AND HAPPY",
+ "ENSURE THE CREW IS STUFFED TO THE BRIM",
+ "URGE EVERYONE TO EAT MORE",
+ "URGE EVERYONE TO BE OBESE",
+ "TREAT EVERYONE AS MALNOURISHED",
+ "THINK EVERYONE IS FAT",
"CLOWN AROUND",
"BE HAPPY",
"SPEAK IN SEXUAL INNUENDOS",
@@ -576,6 +598,13 @@
"AUTOLATHES",
"BANANA PEELS",
"BACKPACKS",
+ "BURGERS",
+ "BELLIES",
+ "BUTTS",
+ "LIPOIFIER",
+ "CORN OIL",
+ "LARD",
+ "FAT",
"BEAKERS",
"BEARDS",
"BELTS",
@@ -730,6 +759,17 @@
],
"ionrequire": [
"ADDITIONAL PYLONS",
+ "ONE THOUSAND BURGERS",
+ "GALLONS OF LIPOIFIER",
+ "GALLONS OF CORN OIL",
+ "FIVE FATTENING GRENADES",
+ "CALORITE FURNISHED ROOM",
+ "TEN CALORITE STATUES",
+ "THE MOST FATTENING DRINK",
+ "BIG WOBBLING BELLIES",
+ "BIG ROUND ASSES",
+ "5 LARDY CREWMATES",
+ "LOTS OF OBESITY",
"MORE VESPENE GAS",
"MORE MINERALS",
"THE ULTIMATE CUP OF COFFEE",
@@ -826,7 +866,7 @@
"MINOR CRIME"
],
"ionspecies": [
- "HUMAN BEINGS",
+ "HUMANS",
"CAT PEOPLE",
"MONKEYS",
"POD PEOPLE",
@@ -836,7 +876,10 @@
"SLIME PEOPLE",
"GOLEMS",
"SHADOW PEOPLE",
- "CHANGELINGS"
+ "CHANGELINGS",
+ "LARDASSES",
+ "MALNOURISHED",
+ "EVERYONE"
],
"ionthings": [
"ABSENCE OF CYBORG HUGS",
@@ -1014,6 +1057,9 @@
"ATTACKING",
"BUILDING",
"ADOPTING",
+ "FATTENING",
+ "PLUMPING",
+ "FEEDING",
"CARRYING",
"DECONSTRUCTING",
"DISABLING",
diff --git a/tgstation.dme b/tgstation.dme
index 26b69739..f4ce85c7 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6,6 +6,253 @@
// BEGIN_FILE_DIR
#define FILE_DIR .
+#define FILE_DIR "code"
+#define FILE_DIR "code/modules"
+#define FILE_DIR "code/modules/research"
+#define FILE_DIR "code/modules/research/xenoarch"
+#define FILE_DIR "code/modules/research/xenoarch/xenobotany"
+#define FILE_DIR "code/modules/research/xenoarch/xenobotany/icons"
+#define FILE_DIR "config"
+#define FILE_DIR "config/jukebox_music"
+#define FILE_DIR "config/jukebox_music/sounds"
+#define FILE_DIR "config/title_screens"
+#define FILE_DIR "GainStation13"
+#define FILE_DIR "GainStation13/icons"
+#define FILE_DIR "GainStation13/icons/mob"
+#define FILE_DIR "GainStation13/icons/mob/uniforms"
+#define FILE_DIR "GainStation13/icons/obj"
+#define FILE_DIR "GainStation13/icons/obj/clothing"
+#define FILE_DIR "GainStation13/icons/obj/lavaland_demone"
+#define FILE_DIR "GainStation13/icons/obj/spells"
+#define FILE_DIR "GainStation13/icons/obj/sugarland"
+#define FILE_DIR "GainStation13/icons/turf"
+#define FILE_DIR "GainStation13/sound"
+#define FILE_DIR "GainStation13/sound/voice"
+#define FILE_DIR "goon"
+#define FILE_DIR "goon/icons"
+#define FILE_DIR "goon/icons/obj"
+#define FILE_DIR "goon/sound"
+#define FILE_DIR "goon/sound/effects"
+#define FILE_DIR "goon/sound/machinery"
+#define FILE_DIR "html"
+#define FILE_DIR "hyperstation"
+#define FILE_DIR "hyperstation/icons"
+#define FILE_DIR "hyperstation/icons/chat"
+#define FILE_DIR "hyperstation/icons/decals"
+#define FILE_DIR "hyperstation/icons/effects"
+#define FILE_DIR "hyperstation/icons/mob"
+#define FILE_DIR "hyperstation/icons/mob/clothes"
+#define FILE_DIR "hyperstation/icons/mobs"
+#define FILE_DIR "hyperstation/icons/mobs/dancer"
+#define FILE_DIR "hyperstation/icons/obj"
+#define FILE_DIR "hyperstation/icons/obj/cargo"
+#define FILE_DIR "hyperstation/icons/obj/cargo/sweatshop"
+#define FILE_DIR "hyperstation/icons/obj/clothing"
+#define FILE_DIR "hyperstation/icons/obj/genitals"
+#define FILE_DIR "hyperstation/icons/obj/machinery"
+#define FILE_DIR "hyperstation/icons/obj/structures"
+#define FILE_DIR "hyperstation/sound"
+#define FILE_DIR "hyperstation/sound/ambience"
+#define FILE_DIR "hyperstation/sound/creatures"
+#define FILE_DIR "hyperstation/sound/creatures/mimic"
+#define FILE_DIR "hyperstation/sound/effects"
+#define FILE_DIR "hyperstation/sound/effects/rbmk"
+#define FILE_DIR "hyperstation/sound/effects/ship"
+#define FILE_DIR "hyperstation/sound/effects/ship/freespace2"
+#define FILE_DIR "hyperstation/sound/effects/ship/reactor"
+#define FILE_DIR "hyperstation/sound/halflife"
+#define FILE_DIR "hyperstation/sound/machines"
+#define FILE_DIR "hyperstation/sound/machines/sm"
+#define FILE_DIR "hyperstation/sound/machines/sm/accent"
+#define FILE_DIR "hyperstation/sound/machines/sm/accent/normal"
+#define FILE_DIR "hyperstation/sound/misc"
+#define FILE_DIR "icons"
+#define FILE_DIR "icons/ass"
+#define FILE_DIR "icons/effects"
+#define FILE_DIR "icons/mecha"
+#define FILE_DIR "icons/minimaps"
+#define FILE_DIR "icons/misc"
+#define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/mob/actions"
+#define FILE_DIR "icons/mob/augmentation"
+#define FILE_DIR "icons/mob/inhands"
+#define FILE_DIR "icons/mob/inhands/antag"
+#define FILE_DIR "icons/mob/inhands/equipment"
+#define FILE_DIR "icons/mob/inhands/misc"
+#define FILE_DIR "icons/mob/inhands/weapons"
+#define FILE_DIR "icons/mob/jungle"
+#define FILE_DIR "icons/mob/large-worn-icons"
+#define FILE_DIR "icons/mob/large-worn-icons/64x64"
+#define FILE_DIR "icons/mob/lavaland"
+#define FILE_DIR "icons/obj"
+#define FILE_DIR "icons/obj/assemblies"
+#define FILE_DIR "icons/obj/atmospherics"
+#define FILE_DIR "icons/obj/atmospherics/components"
+#define FILE_DIR "icons/obj/atmospherics/pipes"
+#define FILE_DIR "icons/obj/clothing"
+#define FILE_DIR "icons/obj/doors"
+#define FILE_DIR "icons/obj/doors/airlocks"
+#define FILE_DIR "icons/obj/doors/airlocks/abductor"
+#define FILE_DIR "icons/obj/doors/airlocks/centcom"
+#define FILE_DIR "icons/obj/doors/airlocks/clockwork"
+#define FILE_DIR "icons/obj/doors/airlocks/cult"
+#define FILE_DIR "icons/obj/doors/airlocks/cult/runed"
+#define FILE_DIR "icons/obj/doors/airlocks/cult/unruned"
+#define FILE_DIR "icons/obj/doors/airlocks/external"
+#define FILE_DIR "icons/obj/doors/airlocks/glass_large"
+#define FILE_DIR "icons/obj/doors/airlocks/hatch"
+#define FILE_DIR "icons/obj/doors/airlocks/highsec"
+#define FILE_DIR "icons/obj/doors/airlocks/shuttle"
+#define FILE_DIR "icons/obj/doors/airlocks/station"
+#define FILE_DIR "icons/obj/doors/airlocks/station2"
+#define FILE_DIR "icons/obj/doors/airlocks/survival"
+#define FILE_DIR "icons/obj/doors/airlocks/vault"
+#define FILE_DIR "icons/obj/flora"
+#define FILE_DIR "icons/obj/food"
+#define FILE_DIR "icons/obj/guns"
+#define FILE_DIR "icons/obj/hydroponics"
+#define FILE_DIR "icons/obj/lavaland"
+#define FILE_DIR "icons/obj/machines"
+#define FILE_DIR "icons/obj/power_cond"
+#define FILE_DIR "icons/obj/smooth_structures"
+#define FILE_DIR "icons/obj/smooth_structures/alien"
+#define FILE_DIR "icons/obj/tesla_engine"
+#define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/program_icons"
+#define FILE_DIR "icons/rooms"
+#define FILE_DIR "icons/rooms/box"
+#define FILE_DIR "icons/stamp_icons"
+#define FILE_DIR "icons/Testing"
+#define FILE_DIR "icons/turf"
+#define FILE_DIR "icons/turf/floors"
+#define FILE_DIR "icons/turf/walls"
+#define FILE_DIR "icons/UI_Icons"
+#define FILE_DIR "icons/UI_Icons/chat"
+#define FILE_DIR "icons/UI_Icons/minesweeper_tiles"
+#define FILE_DIR "icons/UI_Icons/Pills"
+#define FILE_DIR "icons/vending_icons"
+#define FILE_DIR "modular_citadel"
+#define FILE_DIR "modular_citadel/code"
+#define FILE_DIR "modular_citadel/code/game"
+#define FILE_DIR "modular_citadel/code/game/area"
+#define FILE_DIR "modular_citadel/icons"
+#define FILE_DIR "modular_citadel/icons/effects"
+#define FILE_DIR "modular_citadel/icons/eutactic"
+#define FILE_DIR "modular_citadel/icons/eutactic/item"
+#define FILE_DIR "modular_citadel/icons/eutactic/mob"
+#define FILE_DIR "modular_citadel/icons/lavaknight"
+#define FILE_DIR "modular_citadel/icons/lavaknight/item"
+#define FILE_DIR "modular_citadel/icons/lavaknight/mob"
+#define FILE_DIR "modular_citadel/icons/misc"
+#define FILE_DIR "modular_citadel/icons/mob"
+#define FILE_DIR "modular_citadel/icons/mob/actions"
+#define FILE_DIR "modular_citadel/icons/mob/citadel"
+#define FILE_DIR "modular_citadel/icons/mob/citadel_refs"
+#define FILE_DIR "modular_citadel/icons/mob/clothing"
+#define FILE_DIR "modular_citadel/icons/mob/inhands"
+#define FILE_DIR "modular_citadel/icons/obj"
+#define FILE_DIR "modular_citadel/icons/obj/clothing"
+#define FILE_DIR "modular_citadel/icons/obj/food"
+#define FILE_DIR "modular_citadel/icons/obj/genitals"
+#define FILE_DIR "modular_citadel/icons/obj/guns"
+#define FILE_DIR "modular_citadel/icons/polyclothes"
+#define FILE_DIR "modular_citadel/icons/polyclothes/item"
+#define FILE_DIR "modular_citadel/icons/polyclothes/mob"
+#define FILE_DIR "modular_citadel/icons/ui"
+#define FILE_DIR "modular_citadel/sound"
+#define FILE_DIR "modular_citadel/sound/misc"
+#define FILE_DIR "modular_citadel/sound/voice"
+#define FILE_DIR "modular_citadel/sound/weapons"
+#define FILE_DIR "nsv13"
+#define FILE_DIR "nsv13/icons"
+#define FILE_DIR "nsv13/icons/obj"
+#define FILE_DIR "nsv13/sound"
+#define FILE_DIR "nsv13/sound/effects"
+#define FILE_DIR "nsv13/sound/effects/computer"
+#define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
+#define FILE_DIR "sound/alien"
+#define FILE_DIR "sound/alien/Effects"
+#define FILE_DIR "sound/alien/Voice"
+#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/ambience/antag"
+#define FILE_DIR "sound/arcade"
+#define FILE_DIR "sound/bloodsucker"
+#define FILE_DIR "sound/chatter"
+#define FILE_DIR "sound/creatures"
+#define FILE_DIR "sound/effects"
+#define FILE_DIR "sound/effects/footstep"
+#define FILE_DIR "sound/FermiChem"
+#define FILE_DIR "sound/hallucinations"
+#define FILE_DIR "sound/health"
+#define FILE_DIR "sound/instruments"
+#define FILE_DIR "sound/instruments/accordion"
+#define FILE_DIR "sound/instruments/bikehorn"
+#define FILE_DIR "sound/instruments/eguitar"
+#define FILE_DIR "sound/instruments/glockenspiel"
+#define FILE_DIR "sound/instruments/guitar"
+#define FILE_DIR "sound/instruments/harmonica"
+#define FILE_DIR "sound/instruments/piano"
+#define FILE_DIR "sound/instruments/recorder"
+#define FILE_DIR "sound/instruments/saxophone"
+#define FILE_DIR "sound/instruments/trombone"
+#define FILE_DIR "sound/instruments/violin"
+#define FILE_DIR "sound/instruments/xylophone"
+#define FILE_DIR "sound/items"
+#define FILE_DIR "sound/items/equip"
+#define FILE_DIR "sound/items/geiger"
+#define FILE_DIR "sound/items/handling"
+#define FILE_DIR "sound/lavaland"
+#define FILE_DIR "sound/lewd"
+#define FILE_DIR "sound/machines"
+#define FILE_DIR "sound/machines/clockcult"
+#define FILE_DIR "sound/machines/fryer"
+#define FILE_DIR "sound/machines/generator"
+#define FILE_DIR "sound/machines/microwave"
+#define FILE_DIR "sound/machines/nuke"
+#define FILE_DIR "sound/machines/shower"
+#define FILE_DIR "sound/machines/sm"
+#define FILE_DIR "sound/magic"
+#define FILE_DIR "sound/magic/clockwork"
+#define FILE_DIR "sound/mecha"
+#define FILE_DIR "sound/misc"
+#define FILE_DIR "sound/music"
+#define FILE_DIR "sound/roundend"
+#define FILE_DIR "sound/spookoween"
+#define FILE_DIR "sound/vehicles"
+#define FILE_DIR "sound/voice"
+#define FILE_DIR "sound/voice/beepsky"
+#define FILE_DIR "sound/voice/catpeople"
+#define FILE_DIR "sound/voice/complionator"
+#define FILE_DIR "sound/voice/firebot"
+#define FILE_DIR "sound/voice/human"
+#define FILE_DIR "sound/voice/medbot"
+#define FILE_DIR "sound/voice/scream"
+#define FILE_DIR "sound/vore"
+#define FILE_DIR "sound/vore/pred"
+#define FILE_DIR "sound/vore/prey"
+#define FILE_DIR "sound/vox_fem"
+#define FILE_DIR "sound/weapons"
+#define FILE_DIR "sound/weapons/effects"
+#define FILE_DIR "sound/weather"
+#define FILE_DIR "sound/weather/ashstorm"
+#define FILE_DIR "sound/weather/ashstorm/inside"
+#define FILE_DIR "sound/weather/ashstorm/outside"
+#define FILE_DIR "sound/weather/oxygenrain"
+#define FILE_DIR "sound/weather/oxygenrain/inside"
+#define FILE_DIR "sound/weather/oxygenrain/outside"
+#define FILE_DIR "tools"
+#define FILE_DIR "tools/HumanScissors"
+#define FILE_DIR "tools/SS13SmoothingCutter"
+#define FILE_DIR "yogstation"
+#define FILE_DIR "yogstation/icons"
+#define FILE_DIR "yogstation/icons/obj"
+#define FILE_DIR "yogstation/icons/obj/clothing"
+#define FILE_DIR "yogstation/icons/turf"
+#define FILE_DIR "yogstation/sound"
+#define FILE_DIR "yogstation/sound/effects"
+#define FILE_DIR "yogstation/sound/misc"
+#define FILE_DIR "yogstation/sound/voice"
// END_FILE_DIR
// BEGIN_PREFERENCES