Merge pull request #83 from evilew/tweaks

small tweaks
2025-02-07 20:49:41 +01:00
parent 355d9232c2 0386dec84d
commit bc979b5aae
13 changed files with 350 additions and 116 deletions
--- a/GainStation13/code/clothing/fat_mask.dm
+++ b/GainStation13/code/clothing/fat_mask.dm
@@ -2,8 +2,11 @@
 	name = "drone mask"
 	desc = "A mask that can be connected to an air supply. When seen from certain angles, an orange light is reflected by it."
 	icon = 'GainStation13/icons/obj/clothing/fat_mask.dmi'
+	mob_overlay_icon =  'GainStation13/icons/mob/mask.dmi'
+	anthro_mob_worn_overlay = 'GainStation13/icons/mob/mask.dmi'
 	icon_state = "fat_mask"
 	item_state = "fat_mask"
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
 	var/mob/living/carbon/C

 /obj/item/clothing/mask/gas/fattening/equipped(mob/M, slot)
--- a/GainStation13/code/game/donator.dm
+++ b/GainStation13/code/game/donator.dm
@@ -3,16 +3,16 @@
 //item presets for donator items and other gunk
 //
 /obj/item/clothing/glasses/eyepatch/white
+	icon ='GainStation13/icons/obj/clothing/glasses.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/eyes.dmi'
 	name = "White eyepatch"
 	desc = "Smells faintly of medicine and headaches."
 	icon_state = "eyepatch_white"
 	item_state = "eyepatch_white"

-/obj/item/clothing/glasses/eyepatch/cabal
+/obj/item/clothing/glasses/eyepatch/white/cabal
 	name = "Cabal's Eyepatch"
 	desc = "Vulpine sluts only."
-	icon_state = "eyepatch_white"
-	item_state = "eyepatch_white"

 /obj/item/toy/sword/chloesabre/halsey
 	name = "Halsey's Sabre"
@@ -50,3 +50,4 @@
 /obj/item/crowbar/bronze/glaug
 	name = "Milwaukee Pocket Crowbar"
 	desc = "Much more expensive. Still serves the same function."
+
--- a/GainStation13/code/game/lore_papers.dm
+++ b/GainStation13/code/game/lore_papers.dm
@@ -611,4 +611,4 @@

 /obj/item/paper/fluff/ruins/gateway_fats/facility_report8
 	name = "Report #192 A38 - Lipoifium"
-	info = "Subject 2 - Male, Anthropomorphic Fox, blue fur. Name: Sam S. At the beginning of the testing, subject was recorded to have weight of 160lbs. After a day minutes of exposure, their weight went into quadruple digits. Testing had to be concluded due to insufficient build of the test chamber. More detailed report found in the system."
+	info = "Subject 2 - Male, Anthropomorphic Fox, blue fur. Name: Sam S. At the beginning of the testing, subject was recorded to have weight of 160lbs. After a day of exposure, their weight went into quadruple digits. Testing had to be concluded due to insufficient build of the test chamber. More detailed report found in the system."
--- a/GainStation13/code/game/plushes.dm
+++ b/GainStation13/code/game/plushes.dm
@@ -81,3 +81,8 @@
 	desc = "A plush of a silly-eyed xeno seccie."
 	icon_state = "crowbars"
 	attack_verb = list("squished", "crowbared", "beno'd")
+
+/obj/item/toy/plush/gs13/sharky
+	desc = "A plush of a toothy, sharky creature."
+	icon_state = "sharky"
+	attack_verb = list("squished", "bit", "sharkied")
--- a/GainStation13/code/mechanics/fatness.dm
+++ b/GainStation13/code/mechanics/fatness.dm
@@ -1,4 +1,4 @@
-GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/maintenance, /area/security/prison, /area/holodeck, /area/commons/vacant_room/office, /area/space, /area/ruin, /area/lavaland, /area/awaymission, /area/centcom, /area/fatlab))
+GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/maintenance, /area/security/prison, /area/holodeck, /area/commons/vacant_room/office, /area/space, /area/ruin, /area/lavaland, /area/awaymission, /area/centcom, /area/fatlab, /area/xenoarch))

 /mob/living
 	var/burpslurring = 0 //GS13 - necessary due to "say" being defined by mob/living
--- a/GainStation13/code/mobs/chocoslime.dm
+++ b/GainStation13/code/mobs/chocoslime.dm
@@ -112,6 +112,9 @@
 	see_in_dark = 10
 	maxHealth = 20
 	health = 20
+	obj_damage = 0
+	melee_damage_lower = 0.001
+	melee_damage_upper = 0.001
 	blood_volume = 0 //don't want it to bleed
 	del_on_death = TRUE //it's an apparition, shouldn't have a body
 	movement_type = FLYING
--- a/GainStation13/icons/mob/eyes.dmi
+++ b/GainStation13/icons/mob/eyes.dmi
--- a/GainStation13/icons/mob/mask.dmi
+++ b/GainStation13/icons/mob/mask.dmi
--- a/GainStation13/icons/obj/clothing/glasses.dmi
+++ b/GainStation13/icons/obj/clothing/glasses.dmi
--- a/GainStation13/icons/obj/plushes.dmi
+++ b/GainStation13/icons/obj/plushes.dmi
--- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm
@@ -25,12 +25,22 @@
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "ah" = (
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "ai" = (
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "aj" = (
@@ -46,10 +56,20 @@
 	pixel_x = -2;
 	pixel_y = -1
 	},
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "am" = (
 /obj/item/extinguisher,
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "an" = (
@@ -76,6 +96,15 @@
 	name = "Worn-out APC";
 	pixel_y = -24
 	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "aq" = (
@@ -86,12 +115,20 @@
 /obj/structure/sign/warning/electricshock{
 	pixel_y = -32
 	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "ar" = (
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "as" = (
@@ -99,21 +136,39 @@
 /obj/item/clothing/suit/space/syndicate/orange,
 /obj/item/clothing/head/helmet/space/syndicate/orange,
 /obj/item/clothing/mask/breath,
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "drain";
+	name = "drain"
+	},
 /turf/open/floor/plating,
 /area/ruin/space/djstation)
 "at" = (
 /obj/machinery/door/airlock/maintenance_hatch,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "au" = (
 /obj/structure/closet/emcloset,
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "box_white";
+	name = "drain"
+	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "av" = (
-/obj/machinery/vending/snack,
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "steel_decals_central1";
+	name = "drain"
+	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "aw" = (
@@ -125,89 +180,83 @@
 	dir = 10;
 	icon_state = "steel_decals10"
 	},
+/obj/item/cigbutt{
+	pixel_x = -16;
+	pixel_y = -2
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "ax" = (
 /obj/machinery/light_switch{
 	pixel_y = 28
 	},
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "steel_decals_central1";
+	name = "drain"
+	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "ay" = (
 /obj/machinery/newscaster{
 	pixel_y = 32
 	},
+/obj/structure/closet/firecloset,
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "box_red";
+	name = "drain"
+	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "az" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "aA" = (
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
+/obj/machinery/vending/snack,
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "aB" = (
-/obj/effect/spawner/lootdrop/crate_spawner,
-/turf/open/floor/plasteel/grimy,
+/obj/machinery/sleeper,
+/turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "aC" = (
 /obj/machinery/light_switch{
 	pixel_y = 28
 	},
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/carpet/red,
 /area/ruin/space/djstation)
 "aD" = (
-/obj/structure/bed,
-/obj/item/bedsheet,
-/turf/open/floor/plasteel/grimy,
+/obj/structure/closet,
+/turf/open/floor/carpet/red,
 /area/ruin/space/djstation)
 "aE" = (
 /obj/structure/table,
 /obj/item/flashlight/lamp,
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/carpet/red,
 /area/ruin/space/djstation)
 "aF" = (
 /obj/structure/table,
 /obj/machinery/microwave{
 	pixel_y = 8
 	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "aG" = (
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "aH" = (
-/obj/structure/table,
-/obj/effect/turf_decal/loading_area{
-	dir = 4;
-	icon_state = "drain";
-	name = "drain"
-	},
-/obj/effect/turf_decal/loading_area{
-	icon_state = "drain";
-	name = "drain";
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/rack/shelf,
+/obj/item/storage/box/donkpockets/donkpocketspicy,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "aI" = (
 /obj/structure/chair/office/light,
-/obj/effect/turf_decal/loading_area{
-	icon_state = "steel_decals_central6"
-	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "aJ" = (
@@ -217,74 +266,57 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "aK" = (
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/carpet/red,
 /area/ruin/space/djstation)
 "aL" = (
-/obj/machinery/sleeper{
-	dir = 8
-	},
-/turf/open/floor/plasteel/grimy,
+/obj/structure/bed,
+/obj/item/bedsheet,
+/turf/open/floor/carpet/red,
 /area/ruin/space/djstation)
 "aM" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "aN" = (
 /obj/machinery/light/small,
-/obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
-	dir = 1
+	dir = 8
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/tile/bar{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 9;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/turf/open/floor/plasteel/checker,
 /area/ruin/space/djstation)
 "aO" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
-	dir = 1
+	dir = 8
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/tile/bar{
+	dir = 4
+	},
+/turf/open/floor/plasteel/checker,
 /area/ruin/space/djstation)
 "aP" = (
 /obj/structure/table,
-/obj/effect/turf_decal/loading_area{
-	dir = 8;
-	icon_state = "drain";
-	name = "drain"
-	},
-/obj/effect/turf_decal/loading_area{
-	icon_state = "drain";
-	name = "drain"
+/obj/item/radio{
+	pixel_x = -5;
+	pixel_y = 9
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "aQ" = (
 /obj/structure/table,
-/obj/effect/turf_decal/loading_area{
-	icon_state = "drain";
-	name = "drain"
-	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "aR" = (
 /obj/item/paper/fluff/ruins/djstation,
 /obj/structure/table,
-/obj/effect/turf_decal/loading_area{
-	dir = 4;
-	icon_state = "drain";
-	name = "drain"
-	},
-/obj/effect/turf_decal/loading_area{
-	icon_state = "drain";
-	name = "drain"
-	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "aS" = (
@@ -292,21 +324,21 @@
 	anchored = 1;
 	dir = 4
 	},
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "aT" = (
 /obj/structure/chair{
 	dir = 8
 	},
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "aU" = (
 /obj/machinery/light/small,
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "aV" = (
-/obj/structure/closet,
-/turf/open/floor/plasteel/grimy,
+/obj/effect/spawner/lootdrop/crate_spawner,
+/turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "aW" = (
 /obj/structure/disposalpipe/segment,
@@ -359,6 +391,10 @@
 	dir = 10;
 	icon_state = "steel_decals10"
 	},
+/obj/item/cigbutt{
+	pixel_x = 10;
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/djstation)
 "bc" = (
@@ -462,8 +498,42 @@
 	pixel_y = -14;
 	pixel_x = 12
 	},
+/obj/item/cigbutt{
+	pixel_x = -10;
+	pixel_y = -4
+	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
+"dh" = (
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 1
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "drain";
+	name = "drain"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/djstation)
+"ec" = (
+/obj/structure/chair,
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "steel_decals_central1";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/djstation)
+"gt" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/djstation)
 "gS" = (
 /obj/effect/turf_decal/loading_area{
 	dir = 6;
@@ -478,10 +548,100 @@
 "mU" = (
 /turf/open/floor/catwalk_floor,
 /area/ruin/space/djstation)
+"qQ" = (
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain";
+	dir = 1
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "drain";
+	name = "drain"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/djstation)
+"rp" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "steel_decals_central5";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/djstation)
+"tY" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 6;
+	icon_state = "steel_decals6"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_decals6"
+	},
+/obj/item/cigbutt,
+/obj/item/cigbutt{
+	pixel_x = -6;
+	pixel_y = -23
+	},
+/obj/item/cigbutt{
+	pixel_x = -10;
+	pixel_y = -15
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/djstation)
+"uB" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "steel_decals_central5";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/djstation)
 "vh" = (
 /obj/machinery/telecomms/relay/preset/ruskie,
 /turf/open/floor/catwalk_floor,
 /area/ruin/space/djstation)
+"xf" = (
+/obj/effect/turf_decal/tile/bar{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/bar{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/turf/open/floor/plasteel/checker,
+/area/ruin/space/djstation)
+"xm" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "drain";
+	name = "drain"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/djstation)
+"zi" = (
+/obj/effect/turf_decal/tile/bar{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/bar{
+	dir = 4
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 9;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "steel_panel";
+	name = "drain"
+	},
+/turf/open/floor/plasteel/checker,
+/area/ruin/space/djstation)
 "zm" = (
 /obj/item/radio/intercom{
 	broadcasting = 1;
@@ -493,6 +653,29 @@
 	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
+"zw" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 6;
+	icon_state = "steel_decals6"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_decals6"
+	},
+/obj/item/cigbutt{
+	pixel_x = 7;
+	pixel_y = -18
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/djstation)
+"BX" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "steel_decals_central5";
+	name = "drain"
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/djstation)
 "Co" = (
 /obj/machinery/door/airlock/external{
 	name = "Ruskie DJ Station"
@@ -504,17 +687,38 @@
 /area/ruin/space/djstation)
 "Kw" = (
 /obj/structure/table,
+/obj/item/export/bottle/vodka{
+	pixel_x = -6;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
+	pixel_x = 6;
+	pixel_y = -6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/space/djstation)
+"MQ" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "caution_white";
+	name = "drain"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/space/djstation)
+"MS" = (
 /obj/effect/turf_decal/loading_area{
-	dir = 8;
 	icon_state = "drain";
 	name = "drain"
 	},
+/turf/open/floor/plating,
+/area/ruin/space/djstation)
+"OS" = (
 /obj/effect/turf_decal/loading_area{
-	icon_state = "drain";
-	name = "drain";
-	dir = 1
+	dir = 1;
+	icon_state = "delivery";
+	name = "drain"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plating,
 /area/ruin/space/djstation)
 "To" = (
 /obj/item/radio/intercom{
@@ -526,6 +730,14 @@
 	pixel_y = -14;
 	pixel_x = -12
 	},
+/obj/item/cigbutt{
+	pixel_x = 3;
+	pixel_y = -6
+	},
+/obj/item/cigbutt{
+	pixel_x = -17;
+	pixel_y = 8
+	},
 /turf/open/floor/plasteel,
 /area/ruin/space/djstation)
 "Xy" = (
@@ -597,8 +809,8 @@ ac
 ab
 aa
 af
-aA
-aA
+ec
+zi
 aN
 af
 ae
@@ -622,8 +834,8 @@ ac
 ab
 aa
 af
-aA
-aA
+aH
+xf
 aO
 af
 af
@@ -648,8 +860,8 @@ ab
 aa
 af
 aA
-aA
-aA
+xf
+aO
 aX
 ba
 be
@@ -689,16 +901,16 @@ ac
 ac
 ac
 ag
-ah
-ah
-ah
+qQ
+gt
+gt
 am
-ah
+gt
 ap
 af
 au
 aG
-aG
+BX
 aG
 gS
 af
@@ -725,7 +937,7 @@ av
 bZ
 Kw
 aP
-gS
+zw
 bb
 bg
 af
@@ -746,11 +958,11 @@ an
 ao
 ar
 at
-aG
+uB
 zm
 aI
 aQ
-gS
+tY
 aw
 Xy
 af
@@ -769,11 +981,11 @@ mU
 ak
 mU
 mU
-ah
+MS
 af
 ax
 To
-aH
+aQ
 aR
 gS
 bc
@@ -789,22 +1001,22 @@ ac
 ac
 ac
 ag
-ah
-ah
+dh
+xm
 al
-ah
-ah
+xm
+xm
 as
 af
 ay
 aG
-aG
+rp
 aG
 aY
 bd
-Xy
+MQ
 bi
-ah
+OS
 Co
 "}
 (12,1,1) = {"
@@ -848,7 +1060,7 @@ ab
 aa
 af
 aB
-aK
+Xy
 aS
 af
 aa
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -1,6 +1,6 @@
 /mob/living/carbon/alien/humanoid/royal
 	//Common stuffs for Praetorian and Queen
-	icon = 'icons/mob/alienqueen.dmi'
+	icon = 'GainStation13/icons/mob/alienqueen.dmi' //GS13 - swapping out xeno queen sprites to be more in tune with Geiger's designs
 	status_flags = 0
 	unique_name = 0
 	pixel_x = -16
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -109,7 +109,7 @@
 /datum/gear/donator/white_eyepatch_cabal
 	name = "Cabal's Eyepatch"
 	category = LOADOUT_CATEGORY_DONATOR
-	path = /obj/item/clothing/glasses/eyepatch/cabal
+	path = /obj/item/clothing/glasses/eyepatch/white/cabal
 	ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida")

 /datum/gear/white_eyepatch //accessible to anyone, at donator's request
@@ -135,9 +135,19 @@
 	path = /obj/item/toy/plush/gs13/crowbars
 	ckeywhitelist = list("M16nPregnant", "m16npregnant" )

+/datum/gear/donator/sharky_plush
+	name = "Sharky Plush"
+	category = LOADOUT_CATEGORY_DONATOR
+	path = /obj/item/toy/plush/gs13/sharky
+	ckeywhitelist = list("drawntothicc", "Drawntothicc", "DrawnToThicc", "DRAWNTOTHICC")
+
 /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/suit/labcoat
+	name = "Labcoat"
+	category = LOADOUT_CATEGORY_SUIT
+	path = /obj/item/clothing/suit/toggle/labcoat