Merge pull request #32 from sheepishgoat/tweakin

small tweaks

GainStation13/code/game/donator.dm

@@ -1,130 +1,133 @@
 //GS13: donator items and other ckey-locked junk
-/datum/gear/donator/gatobadge_employee //these are available only to admins with CC-related characters
-	name = "GATO Badge - Employee"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/clothing/accessory/medal/gato_badge/employee
-	ckeywhitelist = list("sonoida", "yeeny")
 
-/datum/gear/donator/gatobadge_middleman //these are available to players who were granted permission to have their characters to CC
-	name = "GATO Badge - Correspondent"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/clothing/accessory/medal/gato_badge/middleman
-	ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber",)
+//commented out everything here, it's bugged
 
-/datum/gear/donator/halsey_overcoat
-	name = "Halsey's Commander Overcoat"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/clothing/suit/chloe/halsey
-	ckeywhitelist = list("yeeny")
+// /datum/gear/donator/gatobadge_employee //these are available only to admins with CC-related characters
+// 	name = "GATO Badge - Employee"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/clothing/accessory/medal/gato_badge/employee
+// 	ckeywhitelist = list("sonoida", "yeeny")
 
-/datum/gear/donator/haydee_suit
-	name = "Haydee Suit"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/clothing/suit/space/hardsuit/engine/haydee
-	ckeywhitelist = list("lumu", "sonoida")
+// /datum/gear/donator/gatobadge_middleman //these are available to players who were granted permission to have their characters to CC
+// 	name = "GATO Badge - Correspondent"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/clothing/accessory/medal/gato_badge/middleman
+// 	ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber",)
 
-/datum/gear/donator/haydee_pistol
-	name = "Haydee Pistol"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee
-	ckeywhitelist = list("lumu", "sonoida")
+// /datum/gear/donator/halsey_overcoat
+// 	name = "Halsey's Commander Overcoat"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/clothing/suit/chloe/halsey
+// 	ckeywhitelist = list("yeeny")
 
-/datum/gear/donator/rose_plush
-	name = "Dezir Rose Plush"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/toy/plush/gs13/rose
-	ckeywhitelist = list("eremitanovem", "sonoida")
+// /datum/gear/donator/haydee_suit
+// 	name = "Haydee Suit"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/clothing/suit/space/hardsuit/engine/haydee
+// 	ckeywhitelist = list("lumu", "sonoida")
 
-/datum/gear/donator/chloe_plush
-	name = "Chloe Plush"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/toy/plush/gs13/chloe
-	ckeywhitelist = list("alphas0")
+// /datum/gear/donator/haydee_pistol
+// 	name = "Haydee Pistol"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee
+// 	ckeywhitelist = list("lumu", "sonoida")
 
-/datum/gear/donator/grimmy_coat
-	name = "Overcoat of the Destitute"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/clothing/suit/storage/blueshield/grimmy
-	ckeywhitelist = list("bbgrimmy")
+// /datum/gear/donator/rose_plush
+// 	name = "Dezir Rose Plush"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/toy/plush/gs13/rose
+// 	ckeywhitelist = list("eremitanovem", "sonoida")
 
-/datum/gear/donator/tarek_gps
-	name = "Tarek's GPS"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/gps/mining
-	ckeywhitelist = list("e926user25")
+// /datum/gear/donator/chloe_plush
+// 	name = "Chloe Plush"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/toy/plush/gs13/chloe
+// 	ckeywhitelist = list("alphas0")
 
-/datum/gear/donator/milwaukee_crowbar
-	name = "Milwaukee Pocket Crowbar"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/crowbar/bronze/glaug
-	ckeywhitelist = list("happytpr")
+// /datum/gear/donator/grimmy_coat
+// 	name = "Overcoat of the Destitute"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/clothing/suit/storage/blueshield/grimmy
+// 	ckeywhitelist = list("bbgrimmy")
 
-/datum/gear/donator/fatfang
-	name = "Fattening Fangs Injector"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/dnainjector/fatfang
-	ckeywhitelist = list("sonoida")
+// /datum/gear/donator/tarek_gps
+// 	name = "Tarek's GPS"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/gps/mining
+// 	ckeywhitelist = list("e926user25")
 
-/datum/gear/donator/toolbelt
-	name = "Empty Toolbelt"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/storage/belt/utility
-	ckeywhitelist = list("killmewitha22", "Killmewitha22", "KILLMEWITHA22", "sonoida")
+// /datum/gear/donator/milwaukee_crowbar
+// 	name = "Milwaukee Pocket Crowbar"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/crowbar/bronze/glaug
+// 	ckeywhitelist = list("happytpr")
 
-//metha rossi you fat hog
+// /datum/gear/donator/fatfang
+// 	name = "Fattening Fangs Injector"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/dnainjector/fatfang
+// 	ckeywhitelist = list("sonoida")
 
-/datum/gear/donator/wgspell_add
-	name = "Weight Gain Spellbook"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/book/granter/spell/fattening
-	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
+// /datum/gear/donator/toolbelt
+// 	name = "Empty Toolbelt"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/storage/belt/utility
+// 	ckeywhitelist = list("killmewitha22", "Killmewitha22", "KILLMEWITHA22", "sonoida")
 
-/datum/gear/donator/wgspell_transfer
-	name = "Weight Transfer Spellbook"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/book/granter/spell/fattening/transfer
-	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
+// //metha rossi you fat hog
 
-/datum/gear/donator/wgspell_take
-	name = "Weight Steal Spellbook"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/book/granter/spell/fattening/steal
-	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
+// /datum/gear/donator/wgspell_add
+// 	name = "Weight Gain Spellbook"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/book/granter/spell/fattening
+// 	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
 
-/datum/gear/donator/white_eyepatch_cabal
-	name = "Cabal's Eyepatch"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/clothing/glasses/eyepatch/cabal
-	ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida")
+// /datum/gear/donator/wgspell_transfer
+// 	name = "Weight Transfer Spellbook"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/book/granter/spell/fattening/transfer
+// 	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
 
-/datum/gear/white_eyepatch //accessible to anyone, at donator's request
-	name = "White Eyepatch"
-	category = LOADOUT_CATEGORY_GLASSES
-	path = /obj/item/clothing/glasses/eyepatch/white
+// /datum/gear/donator/wgspell_take
+// 	name = "Weight Steal Spellbook"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/book/granter/spell/fattening/steal
+// 	ckeywhitelist = list("sonoida", "themrsky", "Not Number")
 
-/datum/gear/donator/metis_plush
-	name = "Metis Plush"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/toy/plush/gs13/metis
-	ckeywhitelist = list("paraillegal", "Paraillegal")
+// /datum/gear/donator/white_eyepatch_cabal
+// 	name = "Cabal's Eyepatch"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/clothing/glasses/eyepatch/cabal
+// 	ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida")
 
-/datum/gear/donator/wheelys
-	name = "Wheely-Heels"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/clothing/shoes/wheelys
-	ckeywhitelist = list("colorlessspy", "Colorlessspy")
+// /datum/gear/white_eyepatch //accessible to anyone, at donator's request
+// 	name = "White Eyepatch"
+// 	category = LOADOUT_CATEGORY_GLASSES
+// 	path = /obj/item/clothing/glasses/eyepatch/white
 
-/datum/gear/donator/crowbars_plush
-	name = "Crowbars Plush"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/toy/plush/gs13/crowbars
-	ckeywhitelist = list("M16nPregnant", "m16npregnant" )
+// /datum/gear/donator/metis_plush
+// 	name = "Metis Plush"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/toy/plush/gs13/metis
+// 	ckeywhitelist = list("paraillegal", "Paraillegal")
 
-/datum/gear/donator/sams_welder
-	name = "Sam's Unlucky Welder"
-	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/weldingtool/bronze
-	ckeywhitelist = list("almaniak", "Almaniak", "AlManiak")
+// /datum/gear/donator/wheelys
+// 	name = "Wheely-Heels"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/clothing/shoes/wheelys
+// 	ckeywhitelist = list("colorlessspy", "Colorlessspy")
+
+// /datum/gear/donator/crowbars_plush
+// 	name = "Crowbars Plush"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/toy/plush/gs13/crowbars
+// 	ckeywhitelist = list("M16nPregnant", "m16npregnant" )
+
+// /datum/gear/donator/sams_welder
+// 	name = "Sam's Unlucky Welder"
+// 	category = LOADOUT_CATEGORY_DONATOR
+// 	path = /obj/item/weldingtool/bronze
+// 	ckeywhitelist = list("almaniak", "Almaniak", "AlManiak")
 
 //
 //item presets for donator items

_maps/RandomRuins/SpaceRuins/feeders_den.dmm

@@ -12,7 +12,7 @@
 "bU" = (/obj/effect/turf_decal/stripes/red/line{dir = 9},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "bW" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/structure/window/reinforced/tinted{dir = 8},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
 "bX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/meter,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
-"cd" = (/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"cd" = (/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "cn" = (/obj/structure/table,/obj/machinery/recharger,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/structure/medkit_cabinet{pixel_y = 27},/obj/item/grenade/chem_grenade/lipoifier_weak{pixel_x = -12},/obj/item/implanter{pixel_x = 9; pixel_y = 15},/obj/item/implanter{pixel_x = 9; pixel_y = 11},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "cw" = (/obj/machinery/light{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "cx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
@@ -48,7 +48,7 @@
 "fM" = (/obj/vehicle/ridden/wheelchair,/obj/machinery/light/small,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
 "fN" = (/obj/machinery/shower{dir = 4; name = "emergency shower"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
 "fS" = (/obj/structure/table/wood,/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{dir = 1},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
-"ga" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/obj/item/trash/boritos,/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden)
+"ga" = (/obj/item/trash/boritos,/obj/structure/sign/poster/contraband/donut_corp{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden)
 "gi" = (/obj/structure/sink{dir = 4; pixel_x = 11},/obj/structure/mirror{pixel_x = 24},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
 "gk" = (/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 4},/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden)
 "gn" = (/obj/item/trash/can,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
@@ -57,18 +57,17 @@
 "gD" = (/obj/structure/lattice/catwalk,/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"; pixel_x = -12; pixel_y = -10},/turf/template_noop,/area/ruin/space/has_grav/feedersden)
 "gF" = (/obj/structure/closet/firecloset/full,/obj/effect/turf_decal/stripes/white/line{dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "gL" = (/obj/structure/sign/poster/contraband/space_cola{pixel_x = 32},/obj/structure/reagent_dispensers/cooking_oil,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
-"gU" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
+"gU" = (/obj/effect/spawner/structure/window/plastitanium,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "gZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "hg" = (/obj/machinery/power/adipoelectric_generator,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "hl" = (/obj/item/storage/toolbox/syndicate,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "hT" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "ie" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/seed_extractor,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "ik" = (/obj/structure/ore_box,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
-"iu" = (/obj/structure/curtain,/obj/effect/turf_decal/tile{dir = 1},/obj/effect/turf_decal/tile{dir = 4},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
 "iv" = (/obj/structure/chair/sofa/corner,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "iN" = (/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment,/obj/machinery/processor,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "iO" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
-"iW" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/light{dir = 1},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"iW" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/light{dir = 1},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "iX" = (/obj/structure/chair/sofa,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "jh" = (/obj/structure/table,/obj/machinery/disposal/bin{pixel_y = -10},/obj/structure/disposalpipe/trunk{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "jI" = (/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden)
@@ -89,7 +88,7 @@
 "mf" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/quantumpad/supply_only{map_pad_id = "denbase"; map_pad_link_id = "lavalandbase"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "mm" = (/obj/machinery/vending/mealdor{free = 1},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "mD" = (/obj/structure/closet/emcloset/anchored,/obj/effect/turf_decal/stripes/white/line{dir = 2},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
-"mJ" = (/obj/structure/chair/sofa/corner{dir = 1},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
+"mJ" = (/obj/structure/chair/sofa/corner{dir = 4},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "mU" = (/obj/structure/sink/kitchen{dir = 8; pixel_x = 11},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "nd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "nr" = (/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden)
@@ -112,7 +111,7 @@
 "pl" = (/obj/machinery/porta_turret/fattening,/obj/structure/lattice/catwalk,/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "pO" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/meat/bacon,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "qh" = (/obj/machinery/food_cart,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
-"qi" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"qi" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "qq" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 6},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "qt" = (/obj/effect/mob_spawn/human/feeders_den/fanatic{dir = 8},/obj/item/flashlight/seclite,/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "qC" = (/obj/structure/falsewall/plastitanium,/obj/structure/fans/tiny/invisible,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
@@ -182,7 +181,7 @@
 "yk" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central7"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/obj/machinery/light{light_color = "#cee5d2"},/obj/item/storage/bag/plants,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "yq" = (/obj/structure/ore_box,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "zc" = (/obj/effect/turf_decal/loading_area{icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
-"zg" = (/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"zg" = (/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "zl" = (/obj/machinery/autolathe/hacked,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "zs" = (/obj/machinery/light/small{dir = 4; light_color = "#d8b1b1"},/turf/open/floor/circuit/red,/area/ruin/space/has_grav/feedersden)
 "zw" = (/obj/machinery/button/door{id = "feederden_cell4"; name = "Cell 4 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = 8},/obj/machinery/button/door{id = "feederden_cell3"; name = "Cell 3 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = -8},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
@@ -194,7 +193,7 @@
 "zJ" = (/obj/structure/rack/shelf,/obj/item/storage/firstaid/fire,/obj/item/storage/firstaid/brute{pixel_x = 5},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "zL" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/store/cake/pound_cake,/obj/machinery/light/small{dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
 "zS" = (/obj/structure/chair/sofa/right{dir = 4},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
-"zY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
+"zY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/spawner/structure/window/plastitanium,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Aa" = (/obj/structure/fans/tiny,/obj/effect/turf_decal{dir = 4},/obj/effect/turf_decal{dir = 8},/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Ag" = (/obj/machinery/vending/boozeomat/all_access,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden)
 "Aj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
@@ -270,24 +269,23 @@
 "Mi" = (/obj/structure/disposalpipe/segment{dir = 10},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Mq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "MV" = (/obj/item/trash/boritos,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
-"MW" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"MW" = (/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_south"},/obj/effect/spawner/structure/window/plastitanium,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "MY" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/item/reagent_containers/food/snacks/spaghetti,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Ng" = (/obj/structure/closet/wardrobe/mixed,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Nk" = (/obj/effect/turf_decal{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Nt" = (/obj/machinery/light{dir = 1},/obj/structure/table,/obj/machinery/plantgenes{pixel_y = 6},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Nv" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/burger/superbite,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "Nx" = (/obj/structure/sign/poster/contraband/corn_oil,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden)
-"Nz" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"Nz" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "NA" = (/obj/structure/sign/poster/contraband/donut_corp{pixel_x = -32},/obj/structure/scale,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden)
 "NB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 10},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
-"NJ" = (/obj/structure/curtain,/obj/effect/turf_decal/tile{dir = 4},/obj/effect/turf_decal/tile{dir = 1},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
+"NJ" = (/obj/structure/curtain,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "borderfloor"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
 "NR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "NU" = (/obj/machinery/abductor/pad/feeder,/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 8},/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden)
 "NX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/railing,/turf/open/floor/plasteel/stairs/left{dir = 4},/area/ruin/space/has_grav/feedersden)
 "Oc" = (/turf/open/floor/wood{icon_state = "wood-broken"},/area/ruin/space/has_grav/feedersden)
 "Ow" = (/obj/effect/turf_decal/sand/plating,/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden)
 "OE" = (/obj/item/trash/can,/obj/effect/mob_spawn/human/feeders_den/victim{dir = 8},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden)
-"OM" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_north"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Pg" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/medkit_cabinet{pixel_y = 27},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "PI" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/spider,/obj/item/reagent_containers/food/snacks/meat/slab/spider,/obj/structure/window/reinforced/tinted{dir = 8},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden)
 "PL" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/obj/machinery/light/small{dir = 1},/obj/structure/scale,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
@@ -298,13 +296,12 @@
 "Ra" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "Rc" = (/obj/machinery/computer/camera_advanced/abductor/feeder,/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 10},/obj/item/paper/fluff/ruins/feeder_den/tool_warning,/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden)
 "Rh" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
-"Rp" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"Rp" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "Rr" = (/obj/structure/table/abductor,/obj/item/abductor/gizmo/feeder,/obj/item/abductor/gizmo/feeder,/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 6},/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden)
-"Ru" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_north"},/obj/effect/turf_decal/tile/red,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
+"Ru" = (/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_north"},/obj/effect/spawner/structure/window/plastitanium,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Rw" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plating/airless,/area/ruin/space/has_grav/feedersden)
 "Rz" = (/obj/structure/railing{dir = 1},/turf/open/floor/plasteel/stairs/left{dir = 8},/area/ruin/space/has_grav/feedersden)
 "RC" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
-"RU" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "Sh" = (/obj/machinery/telecomms/relay/preset/ruskie{use_power = 0},/obj/item/multitool{pixel_x = 8},/turf/open/floor/circuit/red,/area/ruin/space/has_grav/feedersden)
 "Sm" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Sp" = (/obj/structure/sign/warning/radiation{pixel_y = -31},/obj/structure/cable,/obj/machinery/power/rtg/advanced/fullupgrade,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
@@ -339,7 +336,7 @@
 "WN" = (/obj/structure/rack/shelf,/obj/item/reagent_containers/food/snacks/syndicake,/obj/item/reagent_containers/food/snacks/syndicake,/obj/item/reagent_containers/food/snacks/chips,/obj/item/reagent_containers/food/snacks/chips,/obj/item/reagent_containers/food/snacks/cornchips,/obj/item/reagent_containers/food/snacks/cornchips,/obj/item/reagent_containers/food/snacks/candy,/obj/item/reagent_containers/food/snacks/candy,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "WZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden)
 "Xa" = (/obj/structure/table/wood,/obj/item/card/id/syndicate{pixel_y = 14},/obj/item/storage/fancy/cigarettes/cigpack_syndicate{pixel_x = -3},/obj/item/lighter{pixel_x = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
-"Xh" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
+"Xh" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
 "Xo" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/machinery/vending/kink{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden)
 "Xs" = (/obj/structure/rack,/obj/item/storage/bag/ore,/obj/item/t_scanner/adv_mining_scanner/lesser,/obj/item/pickaxe/mini,/obj/item/shovel,/obj/effect/turf_decal/stripes/white/line{dir = 10},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden)
 "XF" = (/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden)
@@ -371,24 +368,24 @@ FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
 FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrBrfmBrBrfmBrFEFEFEFEFEZCeEeEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE
 FEFEFEFEFEFEFEFEFEFEBrBrFEFEFEFEFEFEFEFEFEFEFEBrBrBrwwfmISeEfmBrBrFEFEFEFEeETaBrBrFEFEFEFEFEFEebFEFEFEFEFEFEFE
 FEFEFEFEFEFEFEFEBrBrBrBrBreEfmxZBrBrBrBrBrfmBrfmVefmfmfmfmfmfmISBrfmFEFEFEqFBrBrBrBrFEFEFEFEFEebFEFEFEFEFEFEFE
-FEFEFEebebebebqFBrBrBrBrBrBrFEFEFExZqFBrfmfmISxZfmOMOMOMOMOMeEfmwwfmFEFEFEebBrBrqFFEFEFEFEFEBrqFFEFEFEFEFEFEFE
-FEFEFEFEFEebebqFBrBrBrBrBrBrqFebebebebfmfmfmeEIqOMOMmJrtivOMRuIqZCfmfmFEFEebFEFEebFEFEFEFEBrBrBrBrFEFEFEFEFEFE
+FEFEFEebebebebqFBrBrBrBrBrBrFEFEFExZqFBrfmfmISxZfmRuRuRuRuRueEfmwwfmFEFEFEebBrBrqFFEFEFEFEFEBrqFFEFEFEFEFEFEFE
+FEFEFEFEFEebebqFBrBrBrBrBrBrqFebebebebfmfmfmeEIqRuRumJrtivRuRuIqZCfmfmFEFEebFEFEebFEFEFEFEBrBrBrBrFEFEFEFEFEFE
 FEFEFEFEFEFEBrBrBrxgjIdGBzBrBrFEFExZfmfmBrBrBrDctEpOzSKRoSpcefDcBrBrBrFEFEebFEFEebFEBrBrBrBrBrBrBrFEFEFEFEFEFE
 FEFEFEFEFEBrBrBrBzOwPVOwTOnEBrBrBrfmISBrBrBrBrnrxPoKWHKRKRTHZWDcBrBrBrBrBrqFBrFEebBrBrBrBrBrBrBrBrFEFEFEFEFEFE
 FEFEFEFEFEBrBrDcnrnrqCnrDcDcDcDcDcDcDcDcDcDcDcDcwAoKtffCZcoKNvDcDcDcBrBrBrBrDcDcCnDcDcnrnrnrnrDcBrBrFEFEFEFEFE
-FEFEFEFEBrBrBrnrzLgaUElRnrrjybrjDcaqEUzyBuDcXoKTExoKoKJxoKoKOcKKphDcBrDcDcDcDcLVPLhgnrcyFfdelRnrBrBrFEFEFEFEFE
+FEFEFEFEBrBrBrnrzLgaFflRnrrjybrjDcaqEUzyBuDcXoKTExoKoKJxoKoKOcKKphDcBrDcDcDcDcLVPLhgnrcyFfdelRnrBrBrFEFEFEFEFE
 FEFEFEFEBrBrBrnrLzUEUEEnqDrSsqsqnrQWoFkKJDgUoKoKoKfStbvvADAgoKoKoKDcDcDcbUShnrvHJhvHqDsqUEUEOEnrBrBrFEFEFEFEFE
-FEFEFEFEBrBrBrnrNAsqsqsqHQKnsqgLnrXakKkKqtgUegoKoKnrgUgUgUnroKOcoKiWRUCuYXzsnruAsTSmHQMVsqsqTlnrBrBrFEFEFEFEFE
+FEFEFEFEBrBrBrnrNAsqsqsqHQKnsqgLnrXakKkKqtgUegoKoKnrgUgUgUnroKOcoKiWRpCuYXzsnruAsTSmHQMVsqsqTlnrBrBrFEFEFEFEFE
 FEebebebqFBrBrnrfMsqelzCnrLMelwnnrSXXFXFwODcwYrWOclQeSiXGFCcoKoKoKNzItgUeZICnrhlbghTnrelZwCHfMnrBrBrFEFEFEFEFE
 FEFEFEFEFEBrBrDcnrnrnurkDcgUKHzYDcDcgUdHDcDccwoKoKOcoKoKoKvkrWoKoKNzItDcDcDcDcgUYkzYDcftbxnrnrDcBrBrFEFEFEFEFE
-FEFEFEFEFEBrBrBrnrtZlltPwyLoJWMqLoKofbMWMWzgcdRURUqiRpRpRUXhRURURUjOkKkKRzKoLusabcQKzwgnLTmmnrBrBrFEFEFEFEFEFE
+FEFEFEFEFEBrBrBrnrtZlltPwyLoJWMqLoKofbcdcdzgcdRpRpqiRpRpRpXhRpRpRpjOkKkKRzKoLusabcQKzwgnLTmmnrBrBrFEFEFEFEFEFE
 FEFEFEFEfmBrBrBrnrZnNBLvAjNRgZKWNRAjNXTGTGTGTGBDTGXWZhZhZhqquOuOuOuOuOrJZOWrndWrsNnArBxJLfZnnrqFebebebFEFEFEFE
-FEFEFEfmfmBrBrBrDcDcNJNJDcnrnrnrnrnrnrnrnrnrDcWJiONxgUgUgUuXZpTKDcnrnrQFnrnrnrnrnrnrDciuiuDcDcBrFEFEFEFEFEFEFE
+FEFEFEfmfmBrBrBrDcDcNJNJDcnrnrnrnrnrnrnrnrnrDcWJiONxgUgUgUuXZpTKDcnrnrQFnrnrnrnrnrnrDcNJNJDcDcBrFEFEFEFEFEFEFE
 FEFEBrZCfmISBrBrBrnrMaEqnrikNggqnrWNYEfncnbanrDxvYFDLNdCsRiNvYSsnrZeIoxCkoPgnrridlkCnrfNginrBrBrBrFEFEFEFEFEFE
 FEFEBrBrfmfmBrBrBrnrtyEqnrIGJhJhWsDOlsuklslsvtDxvYSyBeaaaaUBvYmUnrcWmaUerscxtVbXJhkMnrfNdAnrBrBrBrFEFEFEFEFEFE
 FEFEFEBrwwfmeEBrBrDcnrnrDcxGHpEHNkDOtHguboygaQoYvYvYvYvYvYvwvYkdnrgFXsFHYpDBnrzlJhXPDcnrnrDcBrBrBrFEFEFEFEFEFE
 FEFEFEBrxZfmfmBrBrBrBrBrDcDcnrnrDcmflsucaEBPnrvYaDMYMdRhDKjhANYUnrnrnrTPJhfKDcnrRanrDcBrEWYNxZBrBrBrFEFEFEFEFE
-FEFEFEFEfmfmBrBrBrBrBrBrnrnKEfWKnrqhlslszcVFDczAnrnrnrkgnrnrnrnrDcmDnQddRCuFnrNtVWdvnrISVefmfmfxBrBrFEFEFEFEFE
+FEFEFEFEfmfmBrBrBrBrBrBrnrnKEfWKnrqhlslszcVFDczAnrnrnrMWnrnrnrnrDcmDnQddRCuFnrNtVWdvnrISVefmfmfxBrBrFEFEFEFEFE
 FEFEFEFEFEfmBrBrBrBrBrBrnrNUcVgkcRDOrfrfYhdzPItjfhnroHoHoHdrVxnwAaYAtBTYzGzEHivLMisCkgeEfmFEFEebFEFEFEFEFEFEFE
 FEFEFEFEFEFEBrBrBrBrBrBrnrRcvpRrnrqMyqzJjSTUbWTxsunroHoHoHdrBVBVAaYApeWZlhFmEsieuqrEuyRwfmFEFEebFEFEFEFEFEFEFE
 FEFEFEFEFEFEFEBrBrBrBrBrDcnrnrnrDcnrnrnrnrnrnrnrnrpfgDoHWtpfnrnrnrnrnrnWnrnrDcaMsIaMtIUZFEFEFEebFEFEFEFEFEFEFE

_maps/map_files/KiloStation/KiloStation.dmm

@@ -36992,7 +36992,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
-/obj/machinery/vending/mealdor,
+/obj/machinery/vending/wardrobe/cap_wardrobe,
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/captain)
 "bjP" = (

_maps/map_files/MetaStation/MetaStation.dmm

@@ -74477,6 +74477,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
+/obj/machinery/vending/wardrobe/cap_wardrobe,
 /turf/open/floor/carpet,
 /area/command/heads_quarters/captain/private)
 "tcb" = (

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -15881,7 +15881,6 @@
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/captain)
 "aGm" = (
-/obj/machinery/computer/arcade,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -15892,6 +15891,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/vending/wardrobe/cap_wardrobe,
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/captain)
 "aGn" = (

_maps/map_files/generic/CentCom.dmm

@@ -28422,9 +28422,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/centcom/ferry)
-"vkp" = (
-/turf/open/space/basic,
-/area/centcom/prison)
 "vkB" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/neutral,
@@ -86066,9 +86063,9 @@ ntl
 ntl
 ntl
 ntl
-vkp
-vkp
-vkp
+uKm
+uKm
+uKm
 uKm
 uKm
 uKm

code/game/objects/structures/false_walls.dm

@@ -23,7 +23,48 @@
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
-	/turf/closed/wall/clockwork)
+	/turf/closed/indestructible/riveted,
+	/turf/closed/wall/clockwork,
+	/turf/closed/indestructible/riveted/,
+	/turf/closed/indestructible/riveted/uranium,
+	/obj/structure/window/fulltile,
+	/obj/structure/window/reinforced/fulltile,
+	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
+	/obj/machinery/door,
+	/obj/machinery/door/airlock/,
+	/obj/machinery/door/airlock/mining,
+	/obj/machinery/door/airlock/mining/glass,
+	/obj/machinery/door/airlock/medical,
+	/obj/machinery/door/airlock/medical/glass,
+	/obj/machinery/door/airlock/public,
+	/obj/machinery/door/airlock/public/glass,
+	/obj/machinery/door/airlock/research,
+	/obj/machinery/door/airlock/research/glass,
+	/obj/machinery/door/airlock/maintenance,
+	/obj/machinery/door/airlock/maintenance/glass,
+	/obj/machinery/door/airlock/command/,
+	/obj/machinery/door/airlock/command/glass,
+	/obj/machinery/door/airlock/engineering,
+	/obj/machinery/door/airlock/engineering/glass,
+	/obj/machinery/door/airlock/engineering/abandoned,
+	/obj/machinery/door/airlock/security,
+	/obj/machinery/door/airlock/security/glass,
+	/obj/machinery/door/airlock/maintenance/abandoned,
+	/obj/machinery/door/poddoor/shutters/preopen,
+	/obj/machinery/door/poddoor/shutters,
+	/obj/machinery/door/window/eastright,
+	/obj/machinery/door/window/eastleft,
+	/obj/machinery/door/window/northleft,
+	/obj/machinery/door/window/northright,
+	/obj/machinery/door/airlock/external,
+	/obj/machinery/door/airlock,
+	/obj/machinery/door/airlock/hatch,
+	/obj/machinery/door/airlock/engineering/glass/critical,
+	/obj/machinery/door/airlock/atmos,
+	/obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks
 	smooth = SMOOTH_TRUE
 	can_be_unanchored = FALSE
 	CanAtmosPass = ATMOS_PASS_DENSITY

code/game/objects/structures/window.dm

@@ -668,12 +668,16 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
 	/turf/closed/wall/clockwork,
 	/turf/closed/indestructible/riveted/,
 	/turf/closed/indestructible/riveted/uranium,
 	/obj/structure/window/fulltile,
 	/obj/structure/window/reinforced/fulltile,
 	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
 	/obj/machinery/door,
 	/obj/machinery/door/airlock/,
 	/obj/machinery/door/airlock/mining,
@@ -750,12 +754,16 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
 	/turf/closed/wall/clockwork,
 	/turf/closed/indestructible/riveted/,
 	/turf/closed/indestructible/riveted/uranium,
 	/obj/structure/window/fulltile,
 	/obj/structure/window/reinforced/fulltile,
 	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
 	/obj/machinery/door,
 	/obj/machinery/door/airlock/,
 	/obj/machinery/door/airlock/mining,
@@ -811,12 +819,16 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
 	/turf/closed/wall/clockwork,
 	/turf/closed/indestructible/riveted/,
 	/turf/closed/indestructible/riveted/uranium,
 	/obj/structure/window/fulltile,
 	/obj/structure/window/reinforced/fulltile,
 	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
 	/obj/machinery/door,
 	/obj/machinery/door/airlock/,
 	/obj/machinery/door/airlock/mining,
@@ -872,12 +884,16 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
 	/turf/closed/wall/clockwork,
 	/turf/closed/indestructible/riveted/,
 	/turf/closed/indestructible/riveted/uranium,
 	/obj/structure/window/fulltile,
 	/obj/structure/window/reinforced/fulltile,
 	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
 	/obj/machinery/door,
 	/obj/machinery/door/airlock/,
 	/obj/machinery/door/airlock/mining,
@@ -932,12 +948,16 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
 	/turf/closed/wall/clockwork,
 	/turf/closed/indestructible/riveted/,
 	/turf/closed/indestructible/riveted/uranium,
 	/obj/structure/window/fulltile,
 	/obj/structure/window/reinforced/fulltile,
 	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
 	/obj/machinery/door,
 	/obj/machinery/door/airlock/,
 	/obj/machinery/door/airlock/mining,
@@ -993,12 +1013,16 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
 	/turf/closed/wall/clockwork,
 	/turf/closed/indestructible/riveted/,
 	/turf/closed/indestructible/riveted/uranium,
 	/obj/structure/window/fulltile,
 	/obj/structure/window/reinforced/fulltile,
 	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
 	/obj/machinery/door,
 	/obj/machinery/door/airlock/,
 	/obj/machinery/door/airlock/mining,
@@ -1030,7 +1054,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/machinery/door/airlock/hatch,
 	/obj/machinery/door/airlock/engineering/glass/critical,
 	/obj/machinery/door/airlock/atmos,
-	/obj/machinery/door/airlock/highsecurity,)
+	/obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks
 
 	level = 3
 	glass_amount = 2
@@ -1048,12 +1072,16 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
 	/turf/closed/wall/clockwork,
 	/turf/closed/indestructible/riveted/,
 	/turf/closed/indestructible/riveted/uranium,
 	/obj/structure/window/fulltile,
 	/obj/structure/window/reinforced/fulltile,
 	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
 	/obj/machinery/door,
 	/obj/machinery/door/airlock/,
 	/obj/machinery/door/airlock/mining,
@@ -1085,7 +1113,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/machinery/door/airlock/hatch,
 	/obj/machinery/door/airlock/engineering/glass/critical,
 	/obj/machinery/door/airlock/atmos,
-	/obj/machinery/door/airlock/highsecurity,)
+	/obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks
 
 	level = 3
 	glass_amount = 2
@@ -1148,13 +1176,18 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
 	/turf/closed/wall/clockwork,
 	/turf/closed/indestructible/riveted/,
 	/turf/closed/indestructible/riveted/uranium,
 	/obj/structure/window/fulltile,
 	/obj/structure/window/reinforced/fulltile,
 	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
 	/obj/machinery/door,
+	/obj/structure/window/plastitanium,
 	/obj/machinery/door/airlock/,
 	/obj/machinery/door/airlock/mining,
 	/obj/machinery/door/airlock/mining/glass,

code/game/turfs/closed.dm

@@ -113,6 +113,57 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen)
 	smooth = SMOOTH_TRUE
 	explosion_block = INFINITY
 
+	canSmoothWith = list(
+	/turf/closed/wall,
+	/turf/closed/wall/r_wall,
+	/obj/structure/falsewall,
+	/obj/structure/falsewall/brass,
+	/obj/structure/falsewall/reinforced,
+	/turf/closed/wall/rust,
+	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
+	/turf/closed/wall/clockwork,
+	/turf/closed/indestructible/riveted/,
+	/turf/closed/indestructible/riveted/uranium,
+	/obj/structure/window/fulltile,
+	/obj/structure/window/reinforced/fulltile,
+	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
+	/obj/machinery/door,
+	/obj/machinery/door/airlock/,
+	/obj/machinery/door/airlock/mining,
+	/obj/machinery/door/airlock/mining/glass,
+	/obj/machinery/door/airlock/medical,
+	/obj/machinery/door/airlock/medical/glass,
+	/obj/machinery/door/airlock/public,
+	/obj/machinery/door/airlock/public/glass,
+	/obj/machinery/door/airlock/research,
+	/obj/machinery/door/airlock/research/glass,
+	/obj/machinery/door/airlock/maintenance,
+	/obj/machinery/door/airlock/maintenance/glass,
+	/obj/machinery/door/airlock/command/,
+	/obj/machinery/door/airlock/command/glass,
+	/obj/machinery/door/airlock/engineering,
+	/obj/machinery/door/airlock/engineering/glass,
+	/obj/machinery/door/airlock/engineering/abandoned,
+	/obj/machinery/door/airlock/security,
+	/obj/machinery/door/airlock/security/glass,
+	/obj/machinery/door/airlock/maintenance/abandoned,
+	/obj/machinery/door/poddoor/shutters/preopen,
+	/obj/machinery/door/poddoor/shutters,
+	/obj/machinery/door/window/eastright,
+	/obj/machinery/door/window/eastleft,
+	/obj/machinery/door/window/northleft,
+	/obj/machinery/door/window/northright,
+	/obj/machinery/door/airlock/external,
+	/obj/machinery/door/airlock,
+	/obj/machinery/door/airlock/hatch,
+	/obj/machinery/door/airlock/engineering/glass/critical,
+	/obj/machinery/door/airlock/atmos,
+	/obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks
+
 /turf/closed/indestructible/syndicate
 	icon = 'GainStation13/icons/turf/walls/plastitanium_wall.dmi'
 	icon_state = "map-shuttle"

code/game/turfs/simulated/wall/misc_walls.dm

@@ -195,12 +195,16 @@
 	/obj/structure/falsewall/reinforced,
 	/turf/closed/wall/rust,
 	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
 	/turf/closed/wall/clockwork,
 	/turf/closed/indestructible/riveted/,
 	/turf/closed/indestructible/riveted/uranium,
 	/obj/structure/window/fulltile,
 	/obj/structure/window/reinforced/fulltile,
 	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
 	/obj/machinery/door,
 	/obj/machinery/door/airlock/,
 	/obj/machinery/door/airlock/mining,

code/game/turfs/simulated/walls.dm

@@ -30,56 +30,56 @@
 	var/sheet_type = /obj/item/stack/sheet/metal
 	var/sheet_amount = 2
 	var/girder_type = /obj/structure/girder
-
-	canSmoothWith = list( //GS13 edit
-		/turf/closed/wall,
-		/turf/closed/wall/r_wall,
-		/obj/structure/falsewall,
-		/obj/structure/falsewall/brass,
-		/obj/structure/falsewall/reinforced,
-		/turf/closed/wall/rust,
-		/turf/closed/wall/r_wall/rust,
-		/turf/closed/wall/clockwork,
-		/turf/closed/indestructible/riveted/,
-		/turf/closed/indestructible/riveted/uranium,
-		/obj/structure/window/fulltile,
-		/obj/structure/window/reinforced/fulltile,
-		/obj/structure/window/reinforced/tinted/fulltile,
-		/obj/structure/window/plasma/fulltile,
-		/obj/structure/window/plasma/reinforced/fulltile,
-		/obj/machinery/door,
-		/obj/machinery/door/airlock/,
-		/obj/machinery/door/airlock/mining,
-		/obj/machinery/door/airlock/mining/glass,
-		/obj/machinery/door/airlock/medical,
-		/obj/machinery/door/airlock/medical/glass,
-		/obj/machinery/door/airlock/public,
-		/obj/machinery/door/airlock/public/glass,
-		/obj/machinery/door/airlock/research,
-		/obj/machinery/door/airlock/research/glass,
-		/obj/machinery/door/airlock/maintenance,
-		/obj/machinery/door/airlock/maintenance/glass,
-		/obj/machinery/door/airlock/command/,
-		/obj/machinery/door/airlock/command/glass,
-		/obj/machinery/door/airlock/engineering,
-		/obj/machinery/door/airlock/engineering/glass,
-		/obj/machinery/door/airlock/engineering/abandoned,
-		/obj/machinery/door/airlock/security,
-		/obj/machinery/door/airlock/security/glass,
-		/obj/machinery/door/airlock/maintenance/abandoned,
-		/obj/machinery/door/poddoor/shutters/preopen,
-		/obj/machinery/door/poddoor/shutters,
-		/obj/machinery/door/window/eastright,
-		/obj/machinery/door/window/eastleft,
-		/obj/machinery/door/window/northleft,
-		/obj/machinery/door/window/northright,
-		/obj/machinery/door/airlock/external,
-		/obj/machinery/door/airlock,
-		/obj/machinery/door/airlock/hatch,
-		/obj/machinery/door/airlock/engineering/glass/critical,
-		/obj/machinery/door/airlock/atmos,
-		/obj/machinery/door/airlock/highsecurity,
-		/obj/machinery/door/airlock/centcom)
+	canSmoothWith = list(
+	/turf/closed/wall,
+	/turf/closed/wall/r_wall,
+	/obj/structure/falsewall,
+	/obj/structure/falsewall/brass,
+	/obj/structure/falsewall/reinforced,
+	/turf/closed/wall/rust,
+	/turf/closed/wall/r_wall/rust,
+	/turf/closed/indestructible/riveted,
+	/turf/closed/wall/clockwork,
+	/turf/closed/indestructible/riveted/,
+	/turf/closed/indestructible/riveted/uranium,
+	/obj/structure/window/fulltile,
+	/obj/structure/window/reinforced/fulltile,
+	/obj/structure/window/reinforced/tinted/fulltile,
+	/obj/structure/window/plasma/reinforced/fulltile,
+	/obj/structure/window/plasma/fulltile,
+	/obj/structure/window/plasma,
+	/obj/machinery/door,
+	/obj/machinery/door/airlock/,
+	/obj/machinery/door/airlock/mining,
+	/obj/machinery/door/airlock/mining/glass,
+	/obj/machinery/door/airlock/medical,
+	/obj/machinery/door/airlock/medical/glass,
+	/obj/machinery/door/airlock/public,
+	/obj/machinery/door/airlock/public/glass,
+	/obj/machinery/door/airlock/research,
+	/obj/machinery/door/airlock/research/glass,
+	/obj/machinery/door/airlock/maintenance,
+	/obj/machinery/door/airlock/maintenance/glass,
+	/obj/machinery/door/airlock/command/,
+	/obj/machinery/door/airlock/command/glass,
+	/obj/machinery/door/airlock/engineering,
+	/obj/machinery/door/airlock/engineering/glass,
+	/obj/machinery/door/airlock/engineering/abandoned,
+	/obj/machinery/door/airlock/security,
+	/obj/machinery/door/airlock/security/glass,
+	/obj/machinery/door/airlock/maintenance/abandoned,
+	/obj/machinery/door/poddoor/shutters/preopen,
+	/obj/machinery/door/poddoor/shutters,
+	/obj/machinery/door/window/eastright,
+	/obj/machinery/door/window/eastleft,
+	/obj/machinery/door/window/northleft,
+	/obj/machinery/door/window/northright,
+	/obj/machinery/door/airlock/external,
+	/obj/machinery/door/airlock,
+	/obj/machinery/door/airlock/hatch,
+	/obj/machinery/door/airlock/engineering/glass/critical,
+	/obj/machinery/door/airlock/atmos,
+	/obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks
 
 	smooth = SMOOTH_TRUE
 

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -142,6 +142,7 @@
 /obj/item/reagent_containers/food/snacks/rawmeatball
 	name = "raw meatball"
 	desc = "Raw mushy meat. Better cook this!"
+	icon = 'GainStation13/icons/obj/food/food.dmi' //GS13 - better meatball sprite
 	icon_state = "rawmeatball"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meatball
 	list_reagents = list(/datum/reagent/consumable/nutriment = 3)
@@ -152,6 +153,7 @@
 /obj/item/reagent_containers/food/snacks/meatball
 	name = "meatball"
 	desc = "MAMA MIA DAS A SPICY"
+	icon = 'GainStation13/icons/obj/food/food.dmi' //GS13 - better meatball sprite
 	icon_state = "meatball"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -19,7 +19,7 @@
 	name = "GATO Badge - Correspondent"
 	category = LOADOUT_CATEGORY_DONATOR
 	path = /obj/item/clothing/accessory/medal/gato_badge/middleman
-	ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber",)
+	ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber", "PointNshoot", "Plapp", "CubicP1sa", "colorlessspy", "M16nPregnant")
 
 /datum/gear/donator/halsey_overcoat
 	name = "Halsey's Commander Overcoat"
@@ -43,7 +43,7 @@
 	name = "Dezir Rose Plush"
 	category = LOADOUT_CATEGORY_DONATOR
 	path = /obj/item/toy/plush/gs13/rose
-	ckeywhitelist = list("eremitanovem", "sonoida")
+	ckeywhitelist = list("eremitanovem", "sonoida", "Absolutely_Free")
 
 /datum/gear/donator/chloe_plush
 	name = "Chloe Plush"
@@ -135,3 +135,4 @@
 	category = LOADOUT_CATEGORY_DONATOR
 	path = /obj/item/weldingtool/bronze
 	ckeywhitelist = list("almaniak", "Almaniak", "AlManiak")
+