From 2c5099eb6c2d691387df65212fab1a3074dd6697 Mon Sep 17 00:00:00 2001 From: DrDuckedGoose <40559528+DrDuckedGoose@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:42:08 +1100 Subject: [PATCH 01/76] Fix Mapping & Icon Issues Related to Genpop (#10484) * initial * Revert "initial" This reverts commit fa87a2a1d3938f8bef201b7b22b650e790612c8f. * initial * Update turfs.dm --- .../map_files/Deltastation/DeltaStation2.dmm | 2 +- _maps/map_files/KiloStation/KiloStation.dmm | 58 ++++++++---------- _maps/map_files/MetaStation/MetaStation.dmm | 4 +- beestation.dme | 2 +- code/modules/holodeck/turfs.dm | 2 +- icons/turf/prisonfloor.dmi | Bin 1006 -> 680 bytes 6 files changed, 30 insertions(+), 38 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 47444fce1c45c..9755567c18b89 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -87285,7 +87285,7 @@ "vYI" = ( /obj/machinery/light/small, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/security/brig) "vYM" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 117b041e018cd..7e98b08312519 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1643,7 +1643,7 @@ dir = 8 }, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/security/execution/education) "afN" = ( @@ -15843,7 +15843,7 @@ dir = 6 }, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/maintenance/aft) "bCA" = ( @@ -17734,7 +17734,7 @@ dir = 4 }, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/maintenance/port/aft) "bMB" = ( @@ -18322,7 +18322,7 @@ dir = 4 }, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/security/main) "bPh" = ( @@ -21821,7 +21821,7 @@ dir = 9 }, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/port/aft) "cgt" = ( @@ -22993,7 +22993,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/maintenance/port/aft) "ckE" = ( @@ -23177,7 +23177,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/port/aft) "cls" = ( @@ -23187,7 +23187,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/maintenance/port/aft) "clt" = ( @@ -23450,7 +23450,7 @@ dir = 6 }, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/port/aft) "cmm" = ( @@ -24151,7 +24151,7 @@ }, /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/solars/port/aft) "cqa" = ( @@ -24845,7 +24845,7 @@ dir = 9 }, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/security/main) "cta" = ( @@ -25158,7 +25158,7 @@ dir = 4 }, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/maintenance/solars/port/aft) "cuY" = ( @@ -28915,7 +28915,7 @@ dir = 1 }, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/security/execution/education) "cJG" = ( @@ -28935,7 +28935,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/security/execution/education) "cJI" = ( @@ -29137,7 +29137,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/maintenance/aft) "cKx" = ( @@ -29212,7 +29212,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/port/aft) "cKN" = ( @@ -29748,7 +29748,7 @@ dir = 9 }, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/port/aft) "cME" = ( @@ -29770,7 +29770,7 @@ dir = 4 }, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/solars/port/aft) "cMF" = ( @@ -29790,7 +29790,7 @@ dir = 9 }, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/solars/port/aft) "cMG" = ( @@ -29800,7 +29800,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/port/aft) "cMI" = ( @@ -30489,7 +30489,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating{ - icon_state = "platingdmg3" + broken = 1 }, /area/maintenance/solars/port/aft) "cPy" = ( @@ -53904,7 +53904,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/port/aft) "lmw" = ( @@ -54650,14 +54650,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/checkpoint/engineering) -"lxO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/aft) "lxT" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -65936,7 +65928,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/port/aft) "pAX" = ( @@ -115716,8 +115708,8 @@ aMM sfB faK jnr -lxO -lxO +faK +faK cKw wNk cKE diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index eadd49d993368..cc97b6e59fdb8 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -42179,7 +42179,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating{ - icon_state = "platingdmg1" + broken = 1 }, /area/maintenance/fore) "knF" = ( @@ -66945,7 +66945,7 @@ dir = 4 }, /turf/open/floor/plating{ - icon_state = "platingdmg2" + broken = 1 }, /area/maintenance/fore) "tQn" = ( diff --git a/beestation.dme b/beestation.dme index ebf8c02cc2cd0..52bcd1feefbc2 100644 --- a/beestation.dme +++ b/beestation.dme @@ -3760,8 +3760,8 @@ #include "code\modules\ruins\spaceruin_code\whiteshipruin_box.dm" #include "code\modules\security\crimes.dm" #include "code\modules\security\genpop.dm" -#include "code\modules\security\workshop.dm" #include "code\modules\security\prison_scanner.dm" +#include "code\modules\security\workshop.dm" #include "code\modules\security_levels\keycard_authentication.dm" #include "code\modules\security_levels\security_levels.dm" #include "code\modules\shuttle\arrivals.dm" diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index 6bb65f4e949c8..274767e377838 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -204,4 +204,4 @@ /turf/open/floor/holofloor/monotile/light name = "light holotile" desc = "A really big light steel holotile." - icon_state = "monotile_light" + icon_state = "grey_full" diff --git a/icons/turf/prisonfloor.dmi b/icons/turf/prisonfloor.dmi index d32836ac2f3ab637e489983e02c22b2dd2abbe18..a7da23cde2bdf577f2ad6e754dd39493ebbf7655 100644 GIT binary patch delta 503 zcmV&{&Ig^K-qcYNm0UAQqLM8yE78@XX!J#+sbT~{ z)47=ma6M>yPqdz6Tn}<%39aYYT7M4`TF-Id8(8OqfQ)NwoevZQa+JXSUqJv)0E)VX zK)R{0Em08&xdwJ_Dgq%}!p==c(9id8~i$qtCB65+e^MQ(h zrUL7HfC*TCZ=DYyfptDGpTPSwmvXF delta 831 zcmV-F1Hk;K1?~rsBtkh*OjJbx004Y^d@e37a&mHPY;10BZg+Qg2nYxtA0HJJ6>V*8 zadB~QaBy&MZ!$76Z*Oo`R#r?*OmuW~q<0jvkzkvD0@q1IK~z|Utyk-sqaX}*EzGze z+nK)q!!9A9A+?5Mo3H(WF&xR2Gd=!DdCYqKu1q)Qg?!Cla_MjL{N0IKE~b9Ec?;mL zl(}0KfOGwH3n6A%Nqoov&L>{RSOH#sVFftV(+T1lSt?cS$;v~_#kGSX=fFy)}{QpQ6amhOB7(rArJ@`x(ZEYcBDRoe` zC;3RBJ#JEd=AUl;c)wMs?)qzVUsyl&{Xd^T&ja;^T5s8N3^>Grdy%UVIF5nVTlNCL z2j^RmIg$K97HPd@p8-OmUdp|P=K)Ke4+nLi^_D%IAaUt#FO=rp0f&%H?NEqiL$3{Snsw-;z)rnL1U(Ji&!vM(`U38_xB;!!!1wTqwoZG6e&V#;HbT>DDt+(u3tEdn7g>Z5=)q2Zb&4b(>^*mTQdD2^J zJr6!EPXH)Cm@GN+u|J7Hzg$KD4zdK`2O|Le2|#`@1kjH}j30~v^b-r>2V(%TTY~&x z5J2>MkROb?NK7n@AB?(4%v_8gTyYV^4@OHj2~PnG>9KuX%!GZfNypvKY;J1C_h-#+5|A~=Wkx${{wQ$kN$ylg0cVr002ov JPDHLkV1hW3b(#PG From 4897c56e7f9076a43395177448aae355db2d0b47 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Mon, 15 Jan 2024 19:49:44 -0700 Subject: [PATCH 02/76] Automatic changelog generation for PR #10484 [ci skip] --- html/changelogs/AutoChangeLog-pr-10484.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10484.yml diff --git a/html/changelogs/AutoChangeLog-pr-10484.yml b/html/changelogs/AutoChangeLog-pr-10484.yml new file mode 100644 index 0000000000000..10a177c4fa23d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10484.yml @@ -0,0 +1,5 @@ +author: DrDuckedGoose +delete-after: true +changes: + - tweak: Update genpop floors + - bugfix: Fix broken maint floors From d06dde90f7bb6e6ba1b4a34bcc2a4624dbb1518c Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Tue, 16 Jan 2024 03:03:24 +0000 Subject: [PATCH 03/76] Automatic changelog compile [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-10484.yml | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10484.yml diff --git a/html/changelog.html b/html/changelog.html index 019669cb2097a..5ac55702c4d0c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
+

16 January 2024

+

DrDuckedGoose updated:

+
    +
  • Update genpop floors
    • +
  • Fix broken maint floors
    • +
+

15 January 2024

DrDuckedGoose updated: