diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm
index 0ed0531c..6663167b 100644
--- a/GainStation13/code/mobs/chocoslime.dm
+++ b/GainStation13/code/mobs/chocoslime.dm
@@ -46,7 +46,7 @@
 
 
 //Creambeast - basically a bit tougher mob that has feeding ranged attacks
-/mob/living/simple_animal/hostile/feed/creambeast
+/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast
 	name = "Creambeast"
 	desc = "A strange mass of thick, creamy ice cream given some sense of instinct."
 	icon = 'GainStation13/icons/mob/candymonster.dmi'
@@ -101,9 +101,3 @@
 			if(!L.is_mouth_covered(head_only = 1))
 				L.reagents.add_reagent(food_fed, food_per_feeding)
 				L.fullness += (fullness_add)
-
-
-/mob/living/simple_animal/hostile/feed/creambeast/GiveTarget(new_target)
-	if(..()) //we have a target
-		if(isliving(target) && !target.Adjacent(targets_from) && ranged_cooldown <= world.time)
-			OpenFire(target)
diff --git a/_maps/map_files/Mining/Lavaland_Demone.dmm b/_maps/map_files/Mining/Lavaland_Demone.dmm
index 8053ef22..283880f1 100644
--- a/_maps/map_files/Mining/Lavaland_Demone.dmm
+++ b/_maps/map_files/Mining/Lavaland_Demone.dmm
@@ -1,7 +1,7 @@
 "ac" = (/obj/machinery/mineral/ore_redemption,/turf/open/floor/plating,/area/lavaland/demone/villagesilo)
 "ae" = (/obj/structure/table/wood,/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = -8; pixel_y = 18},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = 8; pixel_y = 18},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = 8; pixel_y = 2},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_y = 6},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_y = 2; pixel_x = -7},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice)
 "af" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/open/floor/plating,/area/lavaland/demone/living)
-"ai" = (/mob/living/simple_animal/hostile/feed/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
+"ai" = (/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
 "al" = (/obj/structure/closet/crate,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "ao" = (/obj/machinery/light{dir = 1},/obj/structure/flora/redgrass/redg,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/demone/demonevillage)
 "ap" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
@@ -240,7 +240,6 @@
 "ns" = (/obj/structure/chair/comfy/teal,/turf/open/floor/plasteel/grimy,/area/lavaland/demone/reception)
 "ny" = (/obj/machinery/bluespace_beacon,/turf/open/floor/plasteel,/area/lavaland/demone/living)
 "nA" = (/obj/machinery/conveyor{dir = 8; id = "donut"},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/vault,/area/lavaland/demone/factory)
-"nB" = (/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/mob/living/simple_animal/hostile/feed/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
 "nE" = (/obj/structure/table/reinforced/brass,/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{pixel_x = 9},/obj/item/kitchen/knife,/turf/open/indestructible/chocolate{icon_state = "choclit_3"},/area/ruin/powered/candyland)
 "nH" = (/obj/machinery/door/airlock/public/glass{name = "Lounge Area"},/obj/structure/fans/tiny,/turf/open/floor/carpet/red,/area/lavaland/demone/lobby)
 "nJ" = (/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage)
@@ -337,7 +336,7 @@
 "sn" = (/obj/item/reagent_containers/food/snacks/chococoin{pixel_y = 12},/turf/open/indestructible/chocolate{icon_state = "choclit_4"},/area/ruin/powered/candyland)
 "sp" = (/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 4},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/mineral/sandstone_floor,/area/lavaland/demone/lobby)
 "ss" = (/obj/item/stack/spacecash/c10,/obj/structure/table/wood,/obj/item/stack/spacecash/c10{pixel_y = 6},/obj/item/stack/spacecash/c10{pixel_y = 12},/turf/open/indestructible/chocolate,/area/ruin/powered/candyland)
-"su" = (/obj/structure/chair/brass{dir = 1},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
+"su" = (/obj/structure/chair/brass{dir = 1},/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
 "sD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{dir = 4},/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage)
 "sE" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory)
 "sL" = (/obj/machinery/gibber,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage)
@@ -681,7 +680,7 @@
 "Mw" = (/obj/machinery/power/apc/auto_name/north{name = "Lounge Donut Factory"},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plasteel/grimy,/area/lavaland/demone/reception)
 "Mz" = (/obj/structure/chair/wood/normal{dir = 8},/turf/open/floor/carpet/gato,/area/lavaland/demone/living)
 "MB" = (/obj/item/flashlight/lantern{icon_state = "lantern-on"; on = 1; pixel_x = -8},/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/candyfloor,/area/ruin/powered/candyland)
-"MH" = (/obj/machinery/light{dir = 1},/mob/living/simple_animal/friendly/cakegolem,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
+"MH" = (/obj/machinery/light{dir = 1},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland)
 "MJ" = (/obj/item/reagent_containers/food/snacks/tinychocolate,/turf/open/indestructible/chocolate,/area/ruin/powered/candyland)
 "MK" = (/obj/structure/fence{dir = 4},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
 "ML" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1,/turf/open/floor/plasteel/dark/side{dir = 10},/area/lavaland/demone/tele)
@@ -1036,22 +1035,22 @@ krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCrzenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrkrenenenenDCDCDCDCDCDCDCFdenenenenenenVgQWQWQWQWQWVgenenenenenenenrrenenenBVenenenenenenenFdeneneneneneneneneneneneneneneneneneneneneneneneneneneniqenenenenenenenenenenenenenenenenenenenenenDCenkrkrenenDCDCDCDCDCDCDCDCDCDCDCxBxBggIFMJeDeDeDeDeDeDhnJhiRxBxBxBxBOaKEqZtFRqbzmFxBxBxBpIpIAHXFXFXFpIZxJBoMHXxBxBxBDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenrKDCDCDCDCDCenkrkrkrkrkrenenenenLbFdDCDCDCDCenenenenenenenenMpDPCCJNCCDPMpenenenenenenenenenenenenenenenenenenenenenenenenzEenenrzDCDCDCDCDCFdenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenDCDCDCDCDCDCDCDCDCDCDCxBxBxBggJhiReDeDIFIFeDeDeDIFxBxBxBxBxBdZKERXLnUGbzdZxBxBxBoPotjRototpIINpIpIoMoMxBxBxBxBDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCcXenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrenBVenenenidDCDCDCDCenenenenenDCenenVgDoDoDoDoDoVgenenenFdenenenenenenenenenenenenzEDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenZJUQlqenenenenenenenenenenenenenenenenenenenkJkJenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBggIFIFeDeDhauWOxeDeDxBxBpIHXxBxBdZdZdZdZdZdZdZxBxBpILjototjRpIpIpIeIZxoMoMxBxBxBxBxBDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkr
-krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrenenenDCenenDCDCrrDCenenenenDCDCenenenenkrkrkrkrenenenrzDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkJkJenenenenenenenenenenidDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBggIFnWeDeDeDIFIFIFeDotLjpIwmxBxBxBUMdZaidZfwxBxBxBpIotototLjwmxBxBxBpIpIoMoMwmpIxBxBxBDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr
+krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrenenenDCenenDCDCrrDCenenenenDCDCenenenenkrkrkrkrenenenrzDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkJkJenenenenenenenenenenidDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBggIFnWeDeDeDIFIFIFeDotLjpIwmxBxBxBUMdZdZdZfwxBxBxBpIotototLjwmxBxBxBpIpIoMoMwmpIxBxBxBDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCeneneneneneneneneneneneneniqDCDCDCDCenkrkrkrenenDCDCDCenenDCenFdenenenDCDCDCDCenenenkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBggggJhIFeDeDeDeDeDotototLjpIpIxBxBipdZdZdZfwxBxBeIototototpIxBxBxBxBxBHXpIpIoMzwxBxBxBDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenDCDCDCenkrkrkrenenDCDCDCDCenDCenenenLbDCDCDCDCDCDCenenkrkrkrkrenenDCDCDCiqDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenDCDCDCDCDCDCDCDCrrenenenenenenenenenenenenenDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBggggIFIFxBxBxBotototototINpIpIxBxBxBdZxBxBxBpIpIotototpIxBxBAUMHepxBxBpIoMoMHXxBxBxBxBDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCANenenenenenenenenenenenenenDCiqenDCDCDCenkrkrkrenenDCDCDCDCenFdenlxidDCDCDCDCDCDCDCDCenenkrkrkrkrenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenDCDCDCDCDCDCDCenenenenenenenenenenenenDCDCDCDCDCDCenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBxBxBxBHXpIZxotjRotototYPHXpIeIxBARxBpIpILjotototjRZxxBxBGgdZdZADADpIoMoMoMxBxBxBxBDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenDCDCDCiqDCDCDCenkrkrkrenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenDCDCDCDCDCDCenenenenenenenenenenDCDCDCDCDCDCenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBwmpIoMpIpICxZxotototototLjoPpIROjBQppIINototototpIpIxBxBtddZNtxBxBZxwmZxoMxBxBxBxBDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr
 krkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCrKenenenenenenenenenenenenenDCDCDCDCDCDCDCenkrkrkreneniqDCDCDCDCDCDCDCDCDCDCDCDCDCDCiqDCenenkrkrkrkrkrkrkrkrkrkrkrenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCxBHXoMoMoMoMoMoMpILjotototototototjYjYLjotototototjppIpIpIxBxBdZxBxBpIpIpIoMoMHXxBxBDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr
-krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrDCkrkrkrkrkrkrenenenkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenrrDCDCDCDCDCDCDCDCenkrkrkrenenenrzDCDCDCDCDCDCDCDCDCDCDCDCrrenenenenkrkrkrkrkrkrkrkrkrkrenenenenenkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCiqenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCxBMBoMoMoMoMoMpIpIpIApLjotototototwKXFotototototLjpIoMoMpIpIxBARxBpIINpIoMoMoMoMxBxBDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr
-krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrenenenDCkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCDCDCDCenkrkrkrenenenenDCDCDCDCDCDCDCDCDCDCDCDCrzenBVenenkrkrkrkrenenkrkrkrenkrenenenenkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCrzenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBoMoMoMoMoPpIpIxBxBpIZxpIototototXFcsotototTkpIpIZxoMoMoMoPROjBQpwmoMoMnBoMoMwmxBDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr
+krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrDCkrkrkrkrkrkrenenenkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenrrDCDCDCDCDCDCDCDCenkrkrkrenenenrzDCDCDCDCDCDCDCDCDCDCDCDCrrenenenenkrkrkrkrkrkrkrkrkrkrenenenenenkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCiqenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCxBMBoMoMoMoMoMpIpIpIApLjotototototwKXFotototototLjpIoMoMpIpIxBARxBpIINpIoMaioMoMxBxBDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr
+krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrenenenDCkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCDCDCDCenkrkrkrenenenenDCDCDCDCDCDCDCDCDCDCDCDCrzenBVenenkrkrkrkrenenkrkrkrenkrenenenenkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCrzenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBoMoMoMoMoPpIpIxBxBpIZxpIototototXFcsotototTkpIpIZxoMoMoMoPROjBQpwmoMoMoMoMoMwmxBDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr
 krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenenkrenenenenenenenenkrkrkrkrkrkrkrkrkrenenenDCDCDCkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCDCDCDCenkrkrkreneneneniqDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrkrkrkrenkrkrkrkrenenenkrenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCMKPzMKMKDCDCDCenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBpIpIoMoMoMpIxBxBxBxBpIeIpIrvototcssaotAppIpIpIxBxBpIoMoMoMHXpIpIoMoMoMoMpIoMzwxBDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr
 krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenkrkrkrenenenenenenenkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenrKDCDCDCDCDCDCDCDCDCDCenkrkrkrenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCiqenenenenenenkrkrkrkrkrkrkrkrenenkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCenenenkrkrkrkrkrkrenenenenkrkrkrkrkrkrkrDCDCDCDCenenenenDCDCenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYDCDCxBxBxBoMoMoMHXxBxBxBxBpIpIoMpIwmpIzDzDpIpIpICxxBxBxBxBpIoMoMpIpIoMoMHXxBxBxBxBxBxBDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkr
 krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenkrenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrenenDCDCDCkrkrDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenkrkrkrkrenkrkrenenenenkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrenenenenenenenkrkrkrkrkrkrDCDCDCDCenenrzDCDCenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBeIoMpIpIxBxBMBpIoMoMoMHXpIoMpIoMoMpIpIxBxBxBxBpIoMbAHDpIoMoMxBxBxBxBFYDCDCDCDCFYFYDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkr
 krkrenkrenenkrkrkrkrkrkrkrkrkrenenenkrenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrenenenDCDCDCkrkrDCDCDCDCDCDCDCDCDCrrenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCiqenenenenenenenenenenkrkrenenenenkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrenenenenenenenenenenkrkrkrkrkrDCDCDCDCenenrrDCDCenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBoMoMeIpIpIpIJByhoMoMoMoMoMoMoMoMJBZxeIxBxBpIoPXOlGnMJBpIxBxBxBxBxBDCDCDCDCFYFYFYFYDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr
 krkrenenenrzkrkrkrkrkrkrkrkrkrkrenenkrkrkrenenkrkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCkrDCDCDCDCDCDCDCDCDCDCrKenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrenenenenrzDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenkrenenenkrkrkrenenenenkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrenenenDCenenenenenenenenkrkrkrkrDCDCDCDCenenDCDCDCenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBpIoMJBINpIoMoMjNJBoMoMoMoMoMoMoMoMoMpIpIpIpIZxJBbAFfoMoMxBxBxBxBxBDCDCDCDCFYFYFYFYDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr
 krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrkrkrenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrkrDCDCDCDCDCDCDCDCDCDCenenenencXDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrenenenDCDCDCDCDCDCDCDCDCDCeOenenenenkrkrkrkrkrkrkrkrenenenenkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrenenenenDCDCDCenenenenenkrkrkrkrkrDCDCDCenenDCDCDCenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBjdoMJBpIoMoMoMJBpIxBxBxBxBYyYyYyxBxBxBxBpIoMoMJBJBoMoMHXxBxBxBxBDCDCFYDCDCDCFYFYDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr
-krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCeneneneneniqDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrenenenenenencXDCDCDCDCcXenenenkrkrkrkrkrkrkrkrkrkrkrenenkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrenenenenenDCDCDCenenenenkrkrkrkrkrDCDCDCenenDCDCenenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCDCxBxBoPoMJBoMoQoMnBJBoPxBCECECECECECECECECExBMBoMJBJBoMoMoMoMxBxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr
-krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenrrDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrenenenenDCDCDCenenenenenkrkrkrkrDCDCDCDCenenDCDCenkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYDCDCDCDCxBxBCxoMoMoMAqqNoMoMzwxBCExBxBCECECExBxBCExBxBHXpIpIoMCxpIoMxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr
+krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCeneneneneniqDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrenenenenenencXDCDCDCDCcXenenenkrkrkrkrkrkrkrkrkrkrkrenenkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrenenenenenDCDCDCenenenenkrkrkrkrkrDCDCDCenenDCDCenenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCDCxBxBoPoMJBoMoQoMoMJBoPxBCECECECECECECECECExBMBoMJBJBoMoMoMoMxBxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr
+krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenrrDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrenenenenDCDCDCenenenenenkrkrkrkrDCDCDCDCenenDCDCenkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYDCDCDCDCxBxBCxoMoMaiAqqNoMoMzwxBCExBxBCECECExBxBCExBxBHXpIpIoMCxpIoMxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr
 krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrenenenkrkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrenkrenenenenenenenenenenkrkrkrkrDCDCDCDCenenenDCenkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYDCDCDCDCDCxBxBpIoMoMoMoMoMoMoMxBCExBxBWACEZyxBxBCExBxBxBxBxBxBxBxBxBxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr
 krkrenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrenenkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrenenenenenenDCenenkrkrkrkrkrDCDCDCDCenenenDCDCkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCDCDCDCxBxBoMHXpIoMoMCxxBxBCECECECECECECECECExBxBxBxBxBxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr
 krkrenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCrrenenenrKenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrenkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrenenenenenenkrkrkrkrkrDCDCDCDCrrenenenDCDCkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBxBxBxBxBxBxBenenenenenenenenenxBxBxBxBxBDCDCDCDCDCFYDCDCDCDCDCDCDCDCDCDCDCDCenenDCDCkrkrkrkrkrkrkrkrkrkr
diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm
index 80650b76..8774e51f 100644
--- a/_maps/map_files/Mining/Lavaland_Lower.dmm
+++ b/_maps/map_files/Mining/Lavaland_Lower.dmm
@@ -42,7 +42,7 @@
 	dir = 1
 	},
 /obj/structure/closet/secure_closet/personal,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "ak" = (
 /obj/item/toy/prize/mauler,
@@ -58,7 +58,7 @@
 	name = "Theatre backroom air alarm";
 	pixel_y = 24
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "an" = (
 /obj/structure/statue/uranium/nuke,
@@ -75,17 +75,11 @@
 /area/lavaland/surface/outdoors)
 "aq" = (
 /obj/machinery/washing_machine,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "ar" = (
 /turf/closed/wall,
 /area/xenoarch/bot)
-"as" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 28
-	},
-/turf/open/floor/plasteel,
-/area/xenoarch/gen)
 "at" = (
 /obj/machinery/vending/autodrobe{
 	req_access = null
@@ -93,7 +87,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "au" = (
 /obj/machinery/light{
@@ -143,15 +137,15 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/arch)
 "aD" = (
-/obj/structure/table,
 /obj/structure/sign/poster/official/random{
 	pixel_x = -32
 	},
-/turf/open/floor/plasteel,
+/obj/structure/closet/athletic_mixed,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "aE" = (
 /obj/machinery/vending/kink,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "aF" = (
 /obj/machinery/door/airlock/maintenance{
@@ -194,7 +188,7 @@
 "aK" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,
 /obj/structure/chair/bench/left,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "aL" = (
 /obj/structure/cable{
@@ -216,15 +210,11 @@
 /area/xenoarch/gen)
 "aN" = (
 /obj/structure/chair/bench/right,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "aO" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/dark/side{
-	dir = 1
-	},
+/obj/machinery/vending/clothing,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "aP" = (
 /obj/effect/turf_decal/loading_area{
@@ -241,10 +231,15 @@
 /turf/open/indestructible/necropolis,
 /area/lavaland/surface/outdoors)
 "aR" = (
-/obj/machinery/holopad,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/bar{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark/side{
 	dir = 1
 	},
@@ -294,13 +289,15 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "aY" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
-	dir = 8
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance{
+	name = "xenoarchaeology refrigerator"
 	},
-/turf/open/floor/plasteel,
+/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/donkpockets,
+/turf/open/floor/plasteel/freezer,
 /area/xenoarch/gen)
 "aZ" = (
 /obj/structure/cable{
@@ -392,7 +389,7 @@
 "bo" = (
 /obj/machinery/light,
 /obj/structure/chair/bench/left,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "bp" = (
 /obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -418,21 +415,26 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "bt" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /obj/structure/punching_bag,
+/obj/effect/turf_decal/box/red,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "bu" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "drain";
+	name = "drain"
 	},
-/obj/structure/table,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/shower{
+	dir = 8
+	},
+/turf/open/floor/plasteel/showroomfloor,
 /area/xenoarch/gen)
 "bv" = (
 /obj/machinery/door/airlock/maintenance{
@@ -451,8 +453,8 @@
 /turf/open/floor/carpet,
 /area/xenoarch/arch)
 "by" = (
-/obj/structure/closet/athletic_mixed,
-/turf/open/floor/plasteel,
+/obj/structure/closet/secure_closet/personal,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "bz" = (
 /obj/machinery/door/airlock/maintenance{
@@ -1613,7 +1615,7 @@
 /obj/structure/table,
 /obj/item/paper_bin,
 /obj/item/pen,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "ec" = (
 /obj/structure/chair/wood{
@@ -2179,7 +2181,7 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/gen)
 "fp" = (
-/obj/structure/kitchenspike,
+/obj/machinery/deepfryer,
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/gen)
 "fq" = (
@@ -2338,10 +2340,11 @@
 /turf/open/floor/plasteel/freezer,
 /area/xenoarch/gen)
 "fP" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets,
-/obj/item/storage/box/donkpockets,
-/turf/open/floor/plasteel/freezer,
+/obj/effect/turf_decal/tile/bar{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/bar,
+/turf/open/floor/plasteel/dark/side,
 /area/xenoarch/gen)
 "fQ" = (
 /obj/structure/flora/ausbushes/ywflowers,
@@ -2593,8 +2596,10 @@
 /turf/closed/wall,
 /area/xenoarch/gen)
 "gq" = (
-/obj/machinery/vending/boozeomat,
-/turf/closed/wall,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plasteel/showroomfloor,
 /area/xenoarch/gen)
 "gr" = (
 /turf/open/floor/plating{
@@ -2659,9 +2664,10 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/structure/table,
 /obj/structure/disposalpipe/segment,
-/obj/machinery/microwave,
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance{
+	name = "xenoarchaeology refrigerator"
+	},
 /turf/open/floor/plasteel/cafeteria,
 /area/xenoarch/gen)
 "gA" = (
@@ -2685,8 +2691,15 @@
 /turf/open/floor/carpet/gato,
 /area/xenoarch/gen)
 "gD" = (
-/obj/machinery/deepfryer,
-/turf/open/floor/plasteel/cafeteria,
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/machinery/shower{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
 /area/xenoarch/gen)
 "gE" = (
 /obj/structure/cable{
@@ -3230,12 +3243,14 @@
 "hY" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/food/condiment/peppermill,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_x = 5
+	},
 /turf/open/floor/plasteel/cafeteria,
 /area/xenoarch/gen)
 "hZ" = (
 /obj/structure/table/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
-/obj/item/reagent_containers/food/condiment/saltshaker,
 /turf/open/floor/plasteel/cafeteria,
 /area/xenoarch/gen)
 "ia" = (
@@ -5396,7 +5411,7 @@
 	network = list("ss13","rd","mine")
 	},
 /obj/structure/chair/bench,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "nj" = (
 /obj/structure/table,
@@ -5580,10 +5595,8 @@
 /turf/open/floor/plasteel,
 /area/xenoarch/gen)
 "nG" = (
-/obj/structure/closet/secure_closet/freezer/kitchen/maintenance{
-	name = "xenoarchaeology refrigerator"
-	},
-/turf/open/floor/plasteel/cafeteria,
+/obj/machinery/door/airlock,
+/turf/open/floor/plasteel/showroomfloor,
 /area/xenoarch/gen)
 "nH" = (
 /obj/effect/turf_decal/arrows{
@@ -7276,6 +7289,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/xenoarch/caloriteresearch_powered)
+"vg" = (
+/obj/structure/table,
+/obj/item/reagent_containers/glass/beaker/waterbottle,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
 "vh" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 4
@@ -7741,6 +7759,11 @@
 "yw" = (
 /turf/closed/mineral/random,
 /area/lavaland/surface/outdoors)
+"yy" = (
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/gen)
 "yA" = (
 /obj/machinery/recharge_station,
 /obj/effect/turf_decal/box,
@@ -7918,8 +7941,9 @@
 /turf/open/floor/plating,
 /area/xenoarch/caloriteresearch_powered)
 "zY" = (
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/plasteel,
+/obj/structure/table,
+/obj/item/reagent_containers/rag/towel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "zZ" = (
 /obj/effect/turf_decal/loading_area{
@@ -8460,6 +8484,7 @@
 	icon_state = "drain";
 	name = "drain"
 	},
+/obj/structure/reagent_dispensers/water_cooler,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "De" = (
@@ -8804,6 +8829,7 @@
 /area/xenoarch/caloriteresearch_powered)
 "FQ" = (
 /obj/structure/weightmachine/weightlifter,
+/obj/effect/turf_decal/box/red,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "FT" = (
@@ -9191,7 +9217,7 @@
 /area/xenoarch/caloriteresearch_powered)
 "IL" = (
 /obj/structure/chair/bench,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "IM" = (
 /obj/structure/table/wood,
@@ -10178,6 +10204,7 @@
 	dir = 4
 	},
 /obj/structure/scale,
+/obj/effect/turf_decal/bot_red,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "Pz" = (
@@ -10411,6 +10438,10 @@
 	icon_state = "engine"
 	},
 /area/xenoarch/nothinghere)
+"RB" = (
+/obj/machinery/vending/boozeomat,
+/turf/open/floor/plasteel/freezer,
+/area/xenoarch/gen)
 "RD" = (
 /obj/effect/turf_decal/stripes/full,
 /obj/machinery/conveyor{
@@ -10789,7 +10820,7 @@
 /obj/item/reagent_containers/rag/towel{
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "TF" = (
 /obj/effect/turf_decal/stripes/line,
@@ -11410,6 +11441,7 @@
 /area/xenoarch/caloriteresearch_powered)
 "Yf" = (
 /obj/structure/weightmachine/stacklifter,
+/obj/effect/turf_decal/box/red,
 /turf/open/floor/plasteel/dark,
 /area/xenoarch/gen)
 "Yg" = (
@@ -12088,7 +12120,7 @@ ab
 Sy
 Sy
 TD
-ai
+fl
 eb
 aD
 Sy
@@ -12343,7 +12375,7 @@ ab
 ab
 ab
 Sy
-zY
+by
 fK
 fK
 fK
@@ -12860,7 +12892,7 @@ Sy
 by
 fK
 IL
-aY
+dO
 ni
 Sy
 bT
@@ -13109,15 +13141,15 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
+Sy
+Sy
+Sy
+Sy
 Sy
 am
 fK
 aN
-aY
+dO
 aN
 Sy
 bS
@@ -13366,10 +13398,10 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
+Sy
+gD
+gD
+gD
 Sy
 aq
 fK
@@ -13623,16 +13655,16 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
 Sy
-as
+gq
+hJ
+hJ
+nG
+fK
 fK
 aM
 fK
-ba
+aO
 Sy
 bW
 Sy
@@ -13880,10 +13912,10 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
+Sy
+bu
+bu
+bu
 Sy
 at
 aE
@@ -14137,10 +14169,10 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
+Sy
+Sy
+Sy
+Sy
 Sy
 Sy
 Sy
@@ -14400,9 +14432,9 @@ ab
 ab
 Sy
 bA
-fl
-aO
-rc
+zY
+aR
+fP
 aA
 Dd
 ar
@@ -14658,8 +14690,8 @@ ab
 Sy
 QL
 FQ
-aO
-rc
+aR
+fP
 bt
 Ax
 ar
@@ -14915,8 +14947,8 @@ ab
 Sy
 aP
 el
-aO
-rc
+aR
+fP
 aA
 Ax
 ar
@@ -15172,8 +15204,8 @@ ab
 Sy
 IH
 Yf
-aO
-rc
+aR
+fP
 Py
 bC
 ar
@@ -15185,11 +15217,11 @@ aw
 eE
 eS
 ar
-kJ
+aY
 fH
 fw
-Sy
-gD
+yy
+gx
 gx
 gx
 hj
@@ -15429,8 +15461,8 @@ ab
 Sy
 av
 el
-aO
-rc
+aR
+fP
 aA
 bD
 ar
@@ -15445,8 +15477,8 @@ ar
 kJ
 fH
 fw
-gq
-nG
+lU
+gx
 gx
 gx
 hO
@@ -15686,8 +15718,8 @@ ab
 Sy
 aP
 FQ
-aO
-rc
+aR
+fP
 bt
 Ax
 ar
@@ -15699,10 +15731,10 @@ eg
 eG
 eP
 ar
-fw
+lU
 fO
 gd
-Sy
+RB
 ip
 gx
 gx
@@ -15942,10 +15974,10 @@ ab
 ab
 Sy
 qJ
-fl
-aO
-rc
-bu
+vg
+aR
+fP
+aA
 Jd
 ar
 cn
@@ -15957,8 +15989,8 @@ eH
 eT
 ar
 lH
-fP
-lU
+fw
+fw
 Sy
 gH
 gS
@@ -16201,7 +16233,7 @@ Sy
 dv
 dv
 aR
-rc
+fP
 cP
 dv
 ar
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index 2175f160..144f2e20 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -59,11 +59,12 @@ GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traito
 		var/mob/M = i
 		M.update_config_movespeed()
 
-// GS13: Import Fat Naga from VoreStation
+// GS13: Import Fat Naga, Alt Naga from VoreStation
 GLOBAL_LIST_INIT(noodle_taurs, list(
 		"Naga",
 		"Tentacle",
-		"Fat Naga"
+		"Fat Naga",
+		"Alt Naga",
 		))
 
 GLOBAL_LIST_INIT(paw_taurs, list(
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index f0f5fb3c..a6af09f6 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -583,9 +583,9 @@ SUBSYSTEM_DEF(ticker)
 	if(SSblackbox.first_death)
 		var/list/ded = SSblackbox.first_death
 		if(ded.len)
-			news_message += " NT Sanctioned Psykers picked up faint traces of someone near the station, allegedly having had died. Their name was: [ded["name"]], [ded["role"]], at [ded["area"]].[ded["last_words"] ? " Their last words were: \"[ded["last_words"]]\"" : ""]"
+			news_message += " GATO Sanctioned Psykers picked up faint traces of someone near the station, allegedly having had died. Their name was: [ded["name"]], [ded["role"]], at [ded["area"]].[ded["last_words"] ? " Their last words were: \"[ded["last_words"]]\"" : ""]"
 		else
-			news_message += " NT Sanctioned Psykers proudly confirm reports that nobody died this shift!"
+			news_message += " GATO Sanctioned Psykers proudly confirm reports that nobody died this shift!"
 
 	if(news_message)
 		send2otherserver(news_source, news_message,"News_Report")
diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm
index edf6f11d..64d6d03a 100644
--- a/code/datums/components/footstep.dm
+++ b/code/datums/components/footstep.dm
@@ -97,8 +97,8 @@
 			var/mob/living/carbon/human/H = LM
 			var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET))
 
-			// GS13: Import Fat Naga from VoreStation
-			if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga") //are we a naga or tentacle taur creature
+			// GS13: Import Fat Naga and Alt Naga from VoreStation
+			if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga") //are we a naga or tentacle taur creature
 				playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
 				return
 
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 03805e4e..59d8baec 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -862,7 +862,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 
 /obj/item/newspaper
 	name = "newspaper"
-	desc = "An issue of The Griffon, the newspaper circulating aboard Kin.Co Space Stations."
+	desc = "An issue of The Catpaw, the newspaper circulating aboard GATO's stations."
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "newspaper"
 	lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index 4bffd82a..b1242198 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -302,7 +302,7 @@
 	name = "Space Law"
 	desc = "A set of Kin-Station guidelines for keeping law and order on their space stations."
 	icon_state = "bookSpaceLaw"
-	author = "Kin.Co PMC"
+	author = "GATO PMC"
 	title = "Space Law"
 	page_link = "Space_Law"
 
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index cdc2bb14..b43ce4e5 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -209,8 +209,8 @@
 	spawn_type = /obj/item/clothing/mask/cigarette/dromedary
 
 /obj/item/storage/fancy/cigarettes/smokekins
-	name = "\improper smokekins packet"
-	desc = "Let the Radiance fill your lungs"
+	name = "\improper smoke-gatitos packet"
+	desc = "Strangely delicious aftertaste."
 	icon_state = "smokekins"
 	spawn_type = /obj/item/clothing/mask/cigarette/smokekins
 
diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm
index 2e48bf9c..823cd104 100644
--- a/code/game/objects/structures/showcase.dm
+++ b/code/game/objects/structures/showcase.dm
@@ -82,7 +82,7 @@
 
 /obj/structure/showcase/machinery/cloning_pod
 	name = "cloning pod exhibit"
-	desc = "Signs describe how cloning pods like these ensure that every Kin.Co employee can carry out their contracts in full, even in the unlikely event of their catastrophic death. Hopefully they aren't all made of cardboard, like this one."
+	desc = "Signs describe how cloning pods like these ensure that every GATO employee can carry out their contracts in full, even in the unlikely event of their catastrophic death. Hopefully they aren't all made of cardboard, like this one."
 	icon = 'icons/obj/machines/cloning.dmi'
 	icon_state = "pod_0"
 
diff --git a/code/game/objects/structures/signs/signs_plaques.dm b/code/game/objects/structures/signs/signs_plaques.dm
index ccd130b9..606faf34 100644
--- a/code/game/objects/structures/signs/signs_plaques.dm
+++ b/code/game/objects/structures/signs/signs_plaques.dm
@@ -7,7 +7,7 @@
 
 /obj/structure/sign/plaques/atmos
 	name = "\improper CEO of the Millennia."
-	desc = "The CEO of GATO, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced light technology, at odds with Nanotrasen."
+	desc = "The CEO of GATO, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced nutrition technology."
 
 /obj/structure/sign/plaques/thunderdome
 	name = "Thunderdome Plaque"
@@ -15,7 +15,7 @@
 
 /obj/structure/sign/plaques/golden
 	name = "CEO of the Millennia"
-	desc = "The CEO of GATO, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced light technology, at odds with Nanotrasen."
+	desc = "The CEO of GATO, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced nutrition technology."
 	icon_state = "goldenplaque"
 
 /obj/structure/sign/plaques/golden/captain
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index ca65ad70..2ee5b8e5 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -683,8 +683,9 @@
 	job_description = "Fanatical degenerate"
 	short_desc = "You are a member of a niche branch of Syndicate with... strange goals."
 	flavour_text = "After months of construction and gathering equipment, your den is finished - a monument to gluttony, equipped with every tool to turn any sharp body into a quivering mound of lard..."
-	important_info = "Keep your den in one piece and away from curious eyes! YOU AREN'T ALLOWED TO CAPTURE / FATTEN UP PEOPLE WHO DON'T DO NON-CON OR DIDN'T AGREE TO IT!!"
+	important_info = "Keep your den in one piece and away from curious eyes! YOU AREN'T ALLOWED TO CAPTURE / FATTEN UP PEOPLE WHO DON'T DO NON-CON OR DIDN'T AGREE TO IT! Despite being able to leave the outpost, you do NOT have a permission to antag or grief."
 	outfit = /datum/outfit/feeders_den/fanatic
+	faction = ROLE_SYNDICATE
 	mirrorcanloadappearance = TRUE
 	assignedrole = "Space Agent"
 	icon = 'icons/obj/machines/sleeper.dmi'
@@ -701,11 +702,14 @@
 	gloves = /obj/item/clothing/gloves/combat
 	ears = /obj/item/radio/headset/syndicate/alt
 	back = /obj/item/storage/backpack
-	r_hand = /obj/item/melee/transforming/energy/sword/saber
+	r_hand = /obj/item/flashlight
 	r_pocket = /obj/item/gun/ballistic/automatic/pistol
 	id = /obj/item/card/id/syndicate/anyone
 	implants = list(/obj/item/implant/weapons_auth)
 
+/datum/outfit/feeders_den/fanatic/post_equip(mob/living/carbon/human/H)
+	H.faction |= ROLE_SYNDICATE
+
 /datum/outfit/feeders_den/fanatic/Destroy()
 	new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
 	..()
@@ -742,10 +746,6 @@
 	new/obj/structure/fluff/empty_sleeper/syndicate(get_turf(src))
 	..()
 
-/obj/effect/mob_spawn/human/feeders_den/victim/startfat(mob/living/carbon/human/new_spawn)
-	new_spawn.fatness = 300
-	return ..()
-
 /obj/effect/mob_spawn/human/feeders_den/victim/special(mob/living/carbon/human/new_spawn)
 	ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
 
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index d3b6f0e7..4f9500dc 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -597,7 +597,7 @@
 	faction = ROLE_SYNDICATE
 	outfit = /datum/outfit/snowsyndie
 	short_desc = "You are a syndicate operative recently awoken from cryostasis in an underground outpost."
-	flavour_text = "You are a syndicate operative recently awoken from cryostasis in an underground outpost. Monitor Nanotrasen communications and record information. All intruders should be \
+	flavour_text = "You are a syndicate operative recently awoken from cryostasis in an underground outpost. Monitor GATO communications and record information. All intruders should be \
 	disposed of swiftly to assure no gathered information is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."
 
 /datum/outfit/snowsyndie
diff --git a/code/modules/events/major_dust.dm b/code/modules/events/major_dust.dm
index d1570ea0..dfa16d32 100644
--- a/code/modules/events/major_dust.dm
+++ b/code/modules/events/major_dust.dm
@@ -10,7 +10,7 @@
 	var/reason = pick(
 		"The station is passing through a debris cloud, expect minor damage \
 		to external fittings and fixtures.",
-		"Nanotrasen Superweapons Division is testing a new prototype \
+		"GATO Superweapons Division is testing a new prototype \
 		[pick("field","projection","nova","super-colliding","reactive")] \
 		[pick("cannon","artillery","tank","cruiser","\[REDACTED\]")], \
 		some mild debris is expected.",
@@ -25,4 +25,4 @@
 				var/obj/item/paper/P = new(C.loc)
 				P.name = "Collision Alert"
 				P.info = "[pick(reason)]"
-				P.update_icon()
\ No newline at end of file
+				P.update_icon()
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
index 8f7e65cd..64423ff2 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/wings.dm
@@ -71,7 +71,6 @@
 /datum/sprite_accessory/deco_wings/punished
 	name = "Burnt Off"
 	icon_state = "punished"
-	locked = TRUE
 
 /datum/sprite_accessory/deco_wings/firewatch
 	name = "Firewatch"
@@ -123,4 +122,9 @@
 
 /datum/sprite_accessory/deco_wings/none
 	name = "None"
-	icon_state = "none"
\ No newline at end of file
+	icon_state = "none"
+
+//virgo port
+/datum/sprite_accessory/deco_wings/spider_legs //Not really /WINGS/ but they protrude from the back, kinda. Might as well have them here.
+	name = "Spider"
+	icon_state = "spider"
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index 41f99948..045761cc 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -53,7 +53,7 @@
 
 /datum/techweb/science	//Global science techweb for RND consoles.
 	id = "SCIENCE"
-	organization = "Nanotrasen"
+	organization = "GATO"
 
 /datum/techweb/Destroy()
 	researched_nodes = null
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index 44bd9801..416ab13f 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -118,7 +118,7 @@
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper_s"
 	short_desc = "You are a syndicate agent, employed in a top secret research facility developing biological weapons plants and toys."
-	flavour_text = "Fortunately, Nanotrasen's activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile from both Nanotrasen and GATO."
+	flavour_text = "Fortunately, GATO's activity in this sector of space is minimal. Continue your research as best you can, and try to keep a low profile from both Nanotrasen and GATO."
 	important_info = "The base is rigged with explosives, DO NOT leave the base or let it fall into enemy hands!" //Changed 'abandon it' to 'leave the base', no more loopholes please, you know who you are.
 	outfit = /datum/outfit/lavaland_syndicate
 	assignedrole = "Lavaland Syndicate"
@@ -148,7 +148,7 @@
 	name = "Syndicate Comms Agent"
 	job_description = "Off-station Syndicate Comms Agent"
 	short_desc = "You are a syndicate comms agent, employed in a top secret research facility developing biological weapons."
-	flavour_text = "Fortunately, Nanotrasen's activity in this sector of space is minimal. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen or GATO off your trail. Do not let the base fall into enemy hands!"
+	flavour_text = "Fortunately, GATO's activity in this sector of space is minimal. Monitor enemy activity as best you can, and try to keep a low profile. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen or GATO off your trail. Do not let the base fall into enemy hands!"
 	important_info = "The base is rigged with explosives, DO NOT leave the base or let it fall into enemy hands!" //Changed 'abandon it' to 'leave the base', no more loopholes please, you know who you are.
 	outfit = /datum/outfit/lavaland_syndicate/comms
 	mirrorcanloadappearance = TRUE
diff --git a/hyperstation/code/mobs/mimic.dm b/hyperstation/code/mobs/mimic.dm
index c89e973c..b64d7da2 100644
--- a/hyperstation/code/mobs/mimic.dm
+++ b/hyperstation/code/mobs/mimic.dm
@@ -151,7 +151,7 @@
 			desc = "It's a black ink pen, modified for use with both paper and Nanotransen-brand Digital-Readpads™!"
 		if(41 to 50)
 			name = "newspaper"
-			desc = "An issue of The Griffon, the newspaper circulating aboard Kin.Co Space Stations."
+			desc = "An issue of The Catpaw, the newspaper circulating aboard GATO stations."
 			icon = 'icons/obj/bureaucracy.dmi'
 			icon_state = "newspaper"
 		if(51 to 60)
diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm
index 835c2853..21bfb34f 100644
--- a/hyperstation/code/modules/resize/resizing.dm
+++ b/hyperstation/code/modules/resize/resizing.dm
@@ -98,8 +98,8 @@ mob/living/get_effective_size()
 
 			//Smaller person being stepped on
 			if(get_effective_size() > tmob.get_effective_size() && iscarbon(src))
-				// GS13: Import Fat Naga from VoreStation
-				if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga")
+				// GS13: Import Fat Naga & Alt Naga from VoreStation
+				if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga")
 					tmob.visible_message("<span class='notice'>[src] carefully slithers around [tmob].</span>", "<span class='notice'>[src]'s huge tail slithers besides you.</span>")
 				else
 					tmob.visible_message("<span class='notice'>[src] carefully steps over [tmob].</span>", "<span class='notice'>[src] steps over you carefully.</span>")
@@ -142,7 +142,7 @@ mob/living/get_effective_size()
 				H.add_movespeed_modifier(MOVESPEED_ID_STOMP, multiplicative_slowdown = 10) //Full stop
 				addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 3) //0.3 seconds
 				if(get_effective_size() > tmob.get_effective_size() && iscarbon(H))
-					if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga")
+					if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga")
 						tmob.visible_message("<span class='danger'>[src] carefully rolls their tail over [tmob]!</span>", "<span class='danger'>[src]'s huge tail rolls over you!</span>")
 					else
 						tmob.visible_message("<span class='danger'>[src] carefully steps on [tmob]!</span>", "<span class='danger'>[src] steps onto you with force!</span>")
@@ -171,7 +171,7 @@ mob/living/get_effective_size()
 				addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 10) //1 second
 				//H.Stun(20)
 				if(get_effective_size() > tmob.get_effective_size() && iscarbon(H))
-					if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga")
+					if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga")
 						tmob.visible_message("<span class='danger'>[src] mows down [tmob] under their tail!</span>", "<span class='userdanger'>[src] plows their tail over you mercilessly!</span>")
 					else
 						tmob.visible_message("<span class='danger'>[src] slams their foot down on [tmob], crushing them!</span>", "<span class='userdanger'>[src] crushes you under their foot!</span>")
@@ -200,13 +200,13 @@ mob/living/get_effective_size()
 				if(get_effective_size() > tmob.get_effective_size() && iscarbon(H))
 					var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET) || (H.shoes && (H.shoes.body_parts_covered & FEET)))
 					if(feetCover)
-						if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga")
+						if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga")
 							tmob.visible_message("<span class='danger'>[src] pins [tmob] under their tail!</span>", "<span class='danger'>[src] pins you beneath their tail!</span>")
 						else
 							tmob.visible_message("<span class='danger'>[src] pins [tmob] helplessly underfoot!</span>", "<span class='danger'>[src] pins you underfoot!</span>")
 						return 1
 					else
-						if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga")
+						if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga" || H.dna.features["taur"] == "Alt Naga")
 							tmob.visible_message("<span class='danger'>[src] snatches up [tmob] underneath their tail!</span>", "<span class='userdanger'>[src]'s tail winds around you and snatches you in its coils!</span>")
 							//tmob.mob_pickup_micro_feet(H)
 							SEND_SIGNAL(tmob, COMSIG_MICRO_PICKUP_FEET, H)
diff --git a/icons/mob/wings.dmi b/icons/mob/wings.dmi
index bf820a8d..57741ccd 100644
Binary files a/icons/mob/wings.dmi and b/icons/mob/wings.dmi differ
diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
index 9e0330a5..3b824de9 100644
--- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -1886,12 +1886,21 @@ datum/sprite_accessory/mam_tails/insect
 	icon_state = "naga"
 	taur_mode = SNEK_TAURIC
 
-// GS13: Import Fat Naga from VoreStation
+// GS13: Import Fat Naga, Alt Naga, Gator Tail from VoreStation
 /datum/sprite_accessory/taur/naga/fat //ported from Vorestation
 	name = "Fat Naga"
 	icon_state = "fatnaga"
 	taur_mode = SNEK_TAURIC
 
+/datum/sprite_accessory/taur/naga/alt //ported from Vorestation
+	name = "Alt Naga"
+	icon_state = "altnaga"
+	taur_mode = SNEK_TAURIC
+
+/datum/sprite_accessory/taur/gator //ported from Vorestation
+	name = "Gator"
+	icon_state = "gator"
+
 /datum/sprite_accessory/taur/otie
 	name = "Otie"
 	icon_state = "otie"
diff --git a/modular_citadel/icons/mob/mam_taur.dmi b/modular_citadel/icons/mob/mam_taur.dmi
index e22b32a3..9537357b 100644
Binary files a/modular_citadel/icons/mob/mam_taur.dmi and b/modular_citadel/icons/mob/mam_taur.dmi differ