Merge branch 'main' of https://github.com/DovaKitty/OpenKeep

DovaKitty · Sep 30, 2024 · df34934 · df34934
2 parents 77a1def + 0077aba
commit df34934
Show file tree

Hide file tree

Showing 319 changed files with 44,835 additions and 2,458 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,7 @@
 name: Bug Report
 description: File a bug report
 title: "[Bug]: "
-
+labels: ["Bug"]
 body:
 - type: markdown
   attributes:
@@ -24,7 +24,7 @@ body:
     multiple: true
     description: Where did the bug happen?
     options:
-      - RogueTown
+      - Dun Manor
       - DakkaTown
   validations:
     required: true

diff --git a/.github/ISSUE_TEMPLATE/suggestion.yml b/.github/ISSUE_TEMPLATE/suggestion.yml
@@ -1,6 +1,7 @@
 name: Suggestion
 description: Put in a suggestion
 title: "[Suggestion]: "
+labels: ["Suggestion"]
 
 body:
 - type: markdown

diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm
@@ -91,7 +91,7 @@
 /turf/open/floor/carpet,
 /area/awaymission/academy/headmaster)
 "ay" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /obj/structure/mirror/magic/lesser{
 	pixel_y = 32
 	},
@@ -429,7 +429,7 @@
 /turf/open/floor/plasteel/dark,
 /area/awaymission/academy/headmaster)
 "bQ" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -1495,7 +1495,7 @@
 /turf/open/floor/plasteel/white,
 /area/awaymission/academy/classrooms)
 "fM" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/wood,
 /area/awaymission/academy/classrooms)
 "fN" = (
@@ -2090,7 +2090,7 @@
 /turf/open/floor/plasteel/cafeteria,
 /area/awaymission/academy/academyaft)
 "in" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /turf/open/floor/plasteel/cafeteria,
 /area/awaymission/academy/academyaft)
 "io" = (
@@ -2253,7 +2253,7 @@
 /turf/open/floor/wood,
 /area/awaymission/academy/academyaft)
 "iP" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /turf/open/floor/engine,
 /area/awaymission/academy/academyaft)
 "iQ" = (
@@ -2805,7 +2805,7 @@
 /turf/open/floor/engine/cult,
 /area/awaymission/academy/academycellar)
 "kP" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/engine/cult,
 /area/awaymission/academy/academycellar)
 "kQ" = (
@@ -2852,7 +2852,7 @@
 /turf/open/floor/engine/cult,
 /area/awaymission/academy/academycellar)
 "kZ" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/decal/remains/human,
 /turf/open/floor/engine/cult,
@@ -2866,7 +2866,7 @@
 /turf/open/floor/engine/cult,
 /area/awaymission/academy/academycellar)
 "lc" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/mineral/uranium,
 /area/awaymission/academy/academycellar)
 "ld" = (
@@ -2877,7 +2877,7 @@
 /turf/open/floor/engine/cult,
 /area/awaymission/academy/academycellar)
 "lf" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /turf/open/floor/engine/cult,
 /area/awaymission/academy/academycellar)
 "lg" = (
@@ -3104,7 +3104,7 @@
 /turf/open/floor/plating,
 /area/awaymission/academy/academyengine)
 "mg" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/vault,
 /area/awaymission/academy/academyengine)
 "mh" = (
@@ -3217,7 +3217,7 @@
 /turf/closed/mineral/random,
 /area/awaymission/academy/academycellar)
 "mE" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/plating,
 /area/awaymission/academy/academygate)
 "mF" = (

diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
@@ -195,7 +195,7 @@
 /turf/open/floor/plating,
 /area/awaymission/cabin)
 "aE" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /obj/effect/baseturf_helper/asteroid/snow,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating{
@@ -2199,7 +2199,7 @@
 "gh" = (
 /obj/structure/weightmachine/weightlifter,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /turf/open/floor/engine,
 /area/awaymission/cabin/caves/mountain)
 "gi" = (
@@ -4366,7 +4366,7 @@
 /turf/open/floor/plating/asteroid/snow,
 /area/awaymission/cabin/caves)
 "lb" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/mineral/plastitanium/red{
 	name = "soviet floor"
@@ -5007,7 +5007,7 @@
 /area/awaymission/cabin/snowforest)
 "mx" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/cobweb/cobweb2{
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2{
 	desc = "No, the spider web doesn't have any secrets. For fucksake."
 	},
 /turf/open/floor/mineral/plastitanium/red{
@@ -5133,7 +5133,7 @@
 	},
 /area/awaymission/cabin/caves/sovietcave)
 "mN" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/mineral/plastitanium/red{
 	name = "soviet floor"

diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
@@ -1108,7 +1108,7 @@
 /obj/structure/table,
 /obj/item/paper/fluff/awaymissions/caves/magma,
 /obj/item/pen,
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/plasteel,
 /area/awaymission/caves/BMP_asteroid/level_two)
 "dj" = (
@@ -1190,7 +1190,7 @@
 /area/awaymission/caves/BMP_asteroid/level_two)
 "dx" = (
 /obj/structure/closet/secure_closet/personal,
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /obj/item/sord,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
@@ -1212,12 +1212,12 @@
 /area/awaymission/caves/northblock)
 "dC" = (
 /obj/structure/closet/secure_closet/personal,
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "dD" = (
 /obj/structure/table/wood,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "dE" = (
@@ -1316,15 +1316,15 @@
 "dY" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /obj/effect/landmark/awaystart,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "dZ" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "ea" = (
@@ -1458,7 +1458,7 @@
 /area/awaymission/caves/BMP_asteroid)
 "ex" = (
 /obj/structure/closet/secure_closet/miner,
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /obj/item/survivalcapsule,
 /obj/item/extinguisher/mini,
 /turf/open/floor/plasteel,
@@ -1528,7 +1528,7 @@
 /obj/structure/table,
 /obj/item/gun/energy/kinetic_accelerator,
 /obj/item/gun/energy/kinetic_accelerator,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /turf/open/floor/plasteel,
 /area/awaymission/caves/listeningpost)
 "eL" = (
@@ -1743,7 +1743,7 @@
 /area/awaymission/caves/BMP_asteroid)
 "fq" = (
 /obj/structure/bed,
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/plasteel,
 /area/awaymission/caves/BMP_asteroid)
 "fr" = (
@@ -1860,7 +1860,7 @@
 /turf/open/floor/plating,
 /area/awaymission/caves/BMP_asteroid)
 "fK" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/plasteel,
 /area/awaymission/caves/BMP_asteroid)
 "fL" = (

diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -3369,7 +3369,7 @@
 /turf/open/floor/engine,
 /area/awaymission/moonoutpost19/research)
 "hd" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /obj/structure/cable,
 /turf/open/floor/plating{
 	heat_capacity = 1e+006
@@ -6460,7 +6460,7 @@
 	},
 /area/awaymission/moonoutpost19/arrivals)
 "nJ" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /turf/open/floor/plating{
 	heat_capacity = 1e+006;
 	icon_state = "platingdmg3"

diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
@@ -236,7 +236,7 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/wood,
 /area/awaymission/snowdin/post/dorm)
 "aX" = (
@@ -633,7 +633,7 @@
 "bO" = (
 /obj/structure/rack,
 /obj/item/storage/toolbox/electrical,
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/dorm)
 "bP" = (
@@ -1763,7 +1763,7 @@
 	pixel_x = -25;
 	specialfunctions = 4
 	},
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/wood,
 /area/awaymission/snowdin/post/dorm)
 "eg" = (
@@ -1849,7 +1849,7 @@
 	name = "Mess Hall APC";
 	pixel_x = 24
 	},
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/awaymission/snowdin/post/messhall)
@@ -2554,7 +2554,7 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/cobweb/cobweb2,
 /obj/effect/turf_decal/tile/green{
 	dir = 1
 	},
@@ -3818,7 +3818,7 @@
 /area/awaymission/snowdin/outside)
 "iN" = (
 /obj/structure/table,
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 8
 	},

diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm
@@ -217,7 +217,7 @@
 	},
 /area/awaymission/wildwest/mines)
 "bb" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/plating,
 /area/awaymission/wildwest/refine)
 "bc" = (
@@ -295,7 +295,7 @@
 /area/awaymission/wildwest/mines)
 "bt" = (
 /obj/structure/closet/crate,
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/plating,
 /area/awaymission/wildwest/refine)
 "bu" = (
@@ -1804,7 +1804,7 @@
 /turf/open/floor/plasteel,
 /area/awaymission/wildwest/refine)
 "fY" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/wood,
 /area/awaymission/wildwest/mines)
@@ -1837,7 +1837,7 @@
 /turf/open/floor/plasteel,
 /area/awaymission/wildwest/refine)
 "gf" = (
-/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/cobweb,
 /turf/open/floor/wood,
 /area/awaymission/wildwest/mines)
 "gg" = (