Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG …

…into upstream-mirror-1591
Fluffy-Frontier · Mar 25, 2024 · 94d8c10 · 94d8c10
2 parents 0a593e5 + ffdee6d
commit 94d8c10
Show file tree

Hide file tree

Showing 321 changed files with 3,105 additions and 2,637 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -12,13 +12,22 @@
 /icons/ @GoldenAlpharex
 
 # Jolly-66
-/modular_nova/modules/mapping @Jolly-66
+/modular_nova/modules/mapping @Jolly-66 @Zergspower
 /tools/UpdatePaths @Jolly-66
 
+# Zergspower
+/modular_nova/modules/borgs @Zergspower
+/modular_nova/modules/borg_buffs @Zergspower
+/modular_nova/modules/ghostcafe @Zergspower
+/modular_nova/modules/hotel_rooms @Zergspower
+/modular_nova/master_files/code/modules/mapfluff @Zergspower
+/modular_nova/modules/ashwalkers @Zergspower
+/modular_nova/modules/aesthetics/keyed_doors @Zergspower
+
 # Multiple Owners
 
 # Maptainers
-/_maps/ @Jolly-66
+/_maps/ @Jolly-66 @Zergspower
 
 # Expensive files that touching basically always cause performance problems
 ## Init times

diff --git a/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm b/_maps/RandomRuins/SpaceRuins/allamericandiner.dmm
@@ -245,12 +245,7 @@
 /area/ruin/space/has_grav/allamericandiner)
 "nq" = (
 /obj/machinery/shower/directional/east,
-/obj/structure/fluff{
-	desc = "What, you think the water just magically soaks into the metallic flooring?";
-	icon = 'icons/obj/mining_zones/survival_pod.dmi';
-	icon_state = "fan_tiny";
-	name = "shower drain"
-	},
+/obj/structure/fluff/shower_drain,
 /obj/item/soap,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/allamericandiner)
@@ -619,12 +614,7 @@
 /area/ruin/space/has_grav/allamericandiner)
 "CF" = (
 /obj/machinery/shower/directional/west,
-/obj/structure/fluff{
-	desc = "What, you think the water just magically soaks into the metallic flooring?";
-	icon = 'icons/obj/mining_zones/survival_pod.dmi';
-	icon_state = "fan_tiny";
-	name = "shower drain"
-	},
+/obj/structure/fluff/shower_drain,
 /obj/item/soap,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/allamericandiner)

diff --git a/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -2483,12 +2483,7 @@
 	pixel_x = 15;
 	pixel_y = 12
 	},
-/obj/structure/fluff{
-	desc = "Ew, I think I see a hairball.";
-	icon = 'icons/obj/mining_zones/survival_pod.dmi';
-	icon_state = "fan_tiny";
-	name = "shower drain"
-	},
+/obj/structure/fluff/shower_drain,
 /obj/machinery/shower/directional/east,
 /turf/open/floor/iron/showroomfloor,
 /area/ruin/space/has_grav/dangerous_research/dorms)

diff --git a/_maps/RandomRuins/SpaceRuins/interdyne.dmm b/_maps/RandomRuins/SpaceRuins/interdyne.dmm
@@ -973,12 +973,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
 "NU" = (
-/obj/structure/fluff{
-	desc = "Ew, I think I see a hairball.";
-	icon = 'icons/obj/mining_zones/survival_pod.dmi';
-	icon_state = "fan_tiny";
-	name = "shower drain"
-	},
+/obj/structure/fluff/shower_drain,
 /obj/machinery/shower/directional/east,
 /obj/item/soap/syndie,
 /obj/machinery/light/blacklight/directional/north,

diff --git a/_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm b/_maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm
@@ -202,9 +202,9 @@
 "GR" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/mob_spawn/corpse/human/clown,
-/obj/item/ammo_casing/energy/c3dbullet,
 /obj/effect/decal/cleanable/blood/footprints,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/a357/spent,
 /turf/open/floor/plating/airless,
 /area/ruin)
 "Ij" = (

diff --git a/_maps/RandomRuins/SpaceRuins/the_outlet.dmm b/_maps/RandomRuins/SpaceRuins/the_outlet.dmm
@@ -1478,9 +1478,7 @@
 /obj/effect/decal/cleanable/dirt{
 	icon_state = "dirt-110"
 	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "rune2"
-	},
+/obj/effect/decal/cleanable/crayon/rune2,
 /mob/living/basic/construct/proteon/hostile,
 /turf/open/floor/iron/white,
 /area/ruin/space/has_grav/the_outlet/researchrooms)
@@ -1574,9 +1572,7 @@
 /area/template_noop)
 "LL" = (
 /mob/living/basic/construct/proteon/hostile,
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "rune2"
-	},
+/obj/effect/decal/cleanable/crayon/rune2,
 /obj/effect/gibspawner/human,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/the_outlet/researchrooms)

diff --git a/_maps/RandomZLevels/museum.dmm b/_maps/RandomZLevels/museum.dmm
@@ -518,15 +518,11 @@
 /turf/open/indestructible/plating,
 /area/awaymission/museum)
 "ek" = (
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "l";
+/obj/effect/decal/cleanable/crayon/l{
 	pixel_x = -10
 	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "i"
-	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "e";
+/obj/effect/decal/cleanable/crayon/i,
+/obj/effect/decal/cleanable/crayon/e{
 	pixel_x = 12
 	},
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1001,15 +997,11 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/museum)
 "ix" = (
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "l";
+/obj/effect/decal/cleanable/crayon/l{
 	pixel_x = -10
 	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "i"
-	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "e";
+/obj/effect/decal/cleanable/crayon/i,
+/obj/effect/decal/cleanable/crayon/e{
 	pixel_x = 12
 	},
 /obj/effect/turf_decal/stripes/line{
@@ -4007,15 +3999,11 @@
 /turf/open/floor/iron/white/small,
 /area/awaymission/museum)
 "Gv" = (
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "l";
+/obj/effect/decal/cleanable/crayon/l{
 	pixel_x = -10
 	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "i"
-	},
-/obj/effect/decal/cleanable/crayon{
-	icon_state = "e";
+/obj/effect/decal/cleanable/crayon/i,
+/obj/effect/decal/cleanable/crayon/e{
 	pixel_x = 12
 	},
 /obj/effect/decal/cleanable/dirt/dust,

diff --git a/_maps/deathmatch/sunrise.dmm b/_maps/deathmatch/sunrise.dmm
@@ -45,7 +45,7 @@
 	pixel_y = -1;
 	pixel_x = -9
 	},
-/turf/open/misc/dirt,
+/turf/open/misc/dirt/station,
 /area/deathmatch)
 "dr" = (
 /obj/structure/closet/crate/wooden,
@@ -254,7 +254,7 @@
 /obj/item/food/grown/wheat{
 	pixel_x = -10
 	},
-/turf/open/misc/dirt,
+/turf/open/misc/dirt/station,
 /area/deathmatch)
 "pG" = (
 /turf/open/floor/wood/large,
@@ -339,7 +339,7 @@
 "uP" = (
 /mob/living/basic/cow,
 /obj/machinery/light,
-/turf/open/misc/dirt,
+/turf/open/misc/dirt/station,
 /area/deathmatch)
 "vC" = (
 /obj/structure/mineral_door/paperframe,
@@ -590,7 +590,7 @@
 /turf/open/misc/grass,
 /area/deathmatch)
 "Na" = (
-/turf/open/misc/dirt,
+/turf/open/misc/dirt/station,
 /area/deathmatch)
 "Nn" = (
 /obj/structure/flora/bush/flowers_br/style_random,
@@ -614,7 +614,7 @@
 /area/deathmatch)
 "OA" = (
 /obj/item/clothing/shoes/cowboy,
-/turf/open/misc/dirt,
+/turf/open/misc/dirt/station,
 /area/deathmatch)
 "OV" = (
 /obj/structure/chair/stool/bamboo{
@@ -636,7 +636,7 @@
 /area/deathmatch)
 "PE" = (
 /obj/structure/water_source/puddle,
-/turf/open/misc/dirt,
+/turf/open/misc/dirt/station,
 /area/deathmatch)
 "PF" = (
 /obj/effect/decal/cleanable/blood/old,
@@ -751,7 +751,7 @@
 /obj/item/food/grown/wheat{
 	pixel_x = -10
 	},
-/turf/open/misc/dirt,
+/turf/open/misc/dirt/station,
 /area/deathmatch)
 "Vm" = (
 /obj/structure/table/wood,

diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -14748,12 +14748,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/obj/structure/fluff{
-	desc = "What, you think the water just magically soaks into the metallic flooring?";
-	icon = 'icons/obj/mining_zones/survival_pod.dmi';
-	icon_state = "fan_tiny";
-	name = "shower drain"
-	},
+/obj/structure/fluff/shower_drain,
 /obj/effect/turf_decal/stripes/white/end,
 /turf/open/floor/iron/white,
 /area/station/medical/pharmacy)