From f2fe45093edb893b97c5a044d3304642887e30fa Mon Sep 17 00:00:00 2001 From: AbsFree Date: Tue, 17 Dec 2024 15:11:31 +0100 Subject: [PATCH 01/25] changed texture --- GainStation13/icons/obj/atmos.dmi | Bin 2068 -> 2104 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/GainStation13/icons/obj/atmos.dmi b/GainStation13/icons/obj/atmos.dmi index 4952aa314624ec6809c4377fa4a5ea8eafe2546a..56c59d4f2447b5d1f9211f172d0e7ce47f519b58 100644 GIT binary patch delta 1896 zcmb7?X*k=77RLWUVy%6tWn!yXLrQ0At%#tOQlu0mVYH|!#y&<9#M(d{2)l z`E+zmu+o`mPno~avv3&uH)U6?ob;D~&r32!*ysacDPW1cX}$O)faSTl<57?;)iiE1zl*(jw}UM}NT8M{`62UY z_|(?A22YC8?T+)?Kn0nDc48?{ue@t$_AtZJB{;3jED+H1We5Z~u`(1;z9){DAO?nwA=RL!(ss%qdTtABAEAVJOl(7vLorIq%2f{Ti@?ZO#q9o z7E`Z|TJuBv=Hz*dKaD_uc~9O7xvwel_a;K+n@{$Z&+AYkq|!V-zwuW_pYy(Ak;7xc zesv3+xplei1nf%N+^pt#Z7_1^o9?%ZlUWdcLVLv)qdV!m+NH7|B*gH-Jydfy34gY6 z;uj+hN4oh`IOxH9*M2Wg3BWX}%JH=~E#XKU=w~L!kN8TQqbncsYnSlNeEU!eK^}h2 zhVWCr_CCaK?SF@Wm%-vX?sxx0OhAeBM-%%IiZ8~c*o~w5B=Fk${T%?G0~?6QVwYOsz6Pcf(Cwr?+@xhB<14P2^bnDaGlxD zF$uDBa&}GvqD)l^08&9goasylRX7|}B}90e`}u*FO`{y-TH$(I&^qK=Z=$p^ywmhO zCGgRoUeZYR%>^u`xzL8e)|{bD3|dJ)x|Z%fkSj7O&u{trS02Wp zP&8K`jbO*=CkXoeP#{nZRt_l_91xj`UzBoxdeCD=-x7b!0EG=yv2-hk6oDz$>8r2h z(J2tw@RP6PjG?)P77M=@XNq*HT8hU9!#42~Sh+q?fo0F_F2eDE7KppG9LjmjH^44C zv<^7v$U~8{c8HTeYRo<^aX77ER6p2G@A+I?PVukf*R@VZ5x@r2SwkjRvqR85dD3>m}$y&Ui|89mL|DdMvD!1lhT6D-nS%%}LPBr-c{mQ>_oDv+S z$Q!r}eRR;3rZ?($mDVDSy^|tuMWZ2<#1=a01)yF0tp?Y`fx}pD&B5cs1Cg4wa)JQ} zjaG-n*skIlYBZ0}2fv@Zeg?09;%Jkf+2WnyVvCkWQ)U)pl`*$Po}2VBj)H z$QG<7_TR$A1&k;ir_yibj3T0_6+gR~%9@kK32FiWg+g(8nRv+{31+BcVj?5x zZbbj>r6lm=(u_Q_`0#lW?8@E{1}GW@7maE$@WUSI^&=)3cT2`^ln16i^H3Rf_g=Fb z^CulXCuW1K=gK||-jbBJxB!R4y{=d)p#6dNciJ!*X)~dsuCGruA|hh;YhvXH*r(Ym z3@OJvh7tv3WMn`|f`Wo!OhKDHwOgIO+?AEUL`$eHT+0q&FwJN0;1I@iOS`GCw#>!z zrWD;mgN%h9U@v?+-bVWqW@j;r9Ffa#q_3~i-Fx>^*t(zHwFq-J*NIRorR`3)LRaB* z=$M8WgQWgHq5KOWB}@u2<|M)5n5%(v$R1uO3Qj=8dX^(*`Tj5Ke{uF3$iBN)Sz0cc P4xE&uoh!Npg-iPfVq#>A delta 1860 zcma)&S5#980*3ERP(UdWLNA8446agK>QV<#NTf<10|_Mr1YALygvq6c0Yz$TsDn{Z znnbD63B3$a4~CvVC`vJ`8fwIKp7vpP&)NT+|LHsDd-$3W#fbc6ND*!Svu9%IW~r;A zlArQGr{9rW(3OtSIG)+Bu2VfxX8E-I$R*h%to=~g<9egaPu`{J8`BHhUm3M!LcR=oB zlRD*MGZ=x0#b=F4P@v(O&!*w*TdDX-=mCwQ1wMA~eBHiDpSb!1pfeVIw^OF4ea+b1 z!63hs7Bf@{EQ>Nm;!obewO^NZ)Wkq7v=jnp8XUYG0|w?1zK;X*U>!%I;r6K8wO$jwc!okoJA)xL{8>TDJ z8@f?M@QZ4#RX;n{Q8ZqG9D@hEkk-&}Vm0c>6o3>h+7=PC37JlP_)vUvc5!h^nG5fF z?=5o01o4|AlTEr~UsnvDF8Ac9Z1D`&33>s(&8l7RZ~FrSIgPxXg9#<50ggZVbr0Fg z-B9LzOKNPio!)*|(Iu`GB>;u@4`iT`Oa|te*WF{B7@cgV3tyWIqI&EuTt`Zi84>$_ARJ_@hR9#Z^F4W}suWZd?ue2ubj?T0v$xO~~ zd)jx`Jrk~P(8(67dkF0hsQgeF!r{ytwbq9Vy6b!zja~OLXujk0$eK9x)c*_B^H^AT zs_cxNT1`{cbL0$XwFoU*!P^A*M%iMf^@!(`aSrG`QfcUPWLKc@tP-ZE=&N^l)d%y) zAgkm_;m2iNbkBzmO_rT*MC}p1hzR2Ghwzm0@>#b#de(hhgC`d^<})+pvnULS)(9nl zIX71W>+0?8{RhBgGNG-CIpfdnvGV&LJwj)eFEZb~`m^~&Eb2E$mIIKl(Umq6S!6YO!t;M&}>Gah3`T5`eJfF|U?a($K!?3L@ zZ|uXuhb-A5oam&W{_n6z)5{4bgz*jKi55qj%rk1CS|^F@fnc+fC~25XUsCOJ%}D3o zMC|(_Kuk5?Io?V4Jh4L9*;%!^CN5l+IWdu0{ukFjD70}j<)&qc`q$Z$JMtFzwTAY) zb(&}({xt6UfScG&e9xl-UzeEotS2*5`mGJ>2K*F{ifW@6(k$)QjUeq<3)P$j^1i~( zyS)`ie}~)^B=Yi!_JPF z?623{xOWQl07Ho&t0X>IFc?&0CAxZHu(Y7ya-ISI zOXFjTiaFiuaY1WwRo!sxM^ej9V!KN(7cyYrfaYrzUNg1zMp5sAu<yF}_SL$C9-Is$?tLcsT|Qr~+O-h3-(^j#51z_2`9>cENIvF-KtHP2C$j=D*i13S z_|@{Y^dU5732nSIww=cC%xlyH9H;~t{XA1m^zanB3T$Qq`lewPtXZ+P>qU1JaBcEu zOQG!zb8Noa@OZ}yQR!_I2npH2M6!esVxlN{DI0yw6ucwQoe!kxQ~{|rHsV4s8Lz_{ zLrj3QF^x_?0Z7Au(9lo`uLmnA(|km%U^luMt6MyxBv85S1r032cj~XHkoj1L@Z%N) z8B~EIs_d^lw>>f#!>OKj@YIyGm=*vS3MsTL$a_ga&2u}+(6?VcIjCTUsTnN`>uYPn z{A^y@uW~6$RwbCS%F5xZx~jLh6IDJ)a%?d&Ev@@^s@vWjC?P@axrKEv4u{j`u9hun zDvKSR7#nlm_!KI;T2*y7I9hUYYD$eO_xlo}I7$#1)*I~NSE$e13lS`Cv;sy(Mj?qx z#iwoj{Z))16BF@+j5v%GN?xq8sHn)Sy`34YF1H^@#fSZT{@*>+!2c2IzkqE`8w&eH z{BGYjuEv{jw(B5V$S(JDnwsQ)R8|8m|4;3Ac#_}1Ig4q9Uf{>j=UnV-ZSiUU0)YX3 ALjV8( From cfc8f4b9cc96bb8ea050de2902636817b9012b64 Mon Sep 17 00:00:00 2001 From: evilew Date: Tue, 17 Dec 2024 15:17:32 +0100 Subject: [PATCH 02/25] donator fix, hopefully... --- modular_citadel/code/modules/client/loadout/__donator.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 07613c2ba1..d7fa6adcaf 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -1,6 +1,5 @@ //This is the file that handles donator loadout items. -//GS13 temporarily placed files here, will solve it eventually - +//GS13 temporarily placed files here, will solve it eventually :clueless: /datum/gear/donator name = "IF YOU SEE THIS, PING A CODER RIGHT NOW!" @@ -19,7 +18,7 @@ name = "GATO Badge - Correspondent" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/accessory/medal/gato_badge/middleman - ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber", "PointNshoot", "Plapp", "CubicP1sa", "cubicp1sa", "plapp", "colorlessspy", "M16nPregnant") + ckeywhitelist = list("johnjimjim", "sonoida", "Sonoida", "SONOIDA", "yeeny", "Not Number", "Not_Number", "NotNumber", "PointNshoot", "pointnshoot", "POINTNSHOOT", "Plapp", "plapp", "PLAPP", "colorlessspy", "Colorlessspy", "COLORLESSSPY", "M16nPregnant", "m16npregnant", "M16NPREGNANT") /datum/gear/donator/halsey_overcoat name = "Halsey's Commander Overcoat" From bc0f8a44c724057464d193e2192975ea7192c3c1 Mon Sep 17 00:00:00 2001 From: evilew Date: Tue, 17 Dec 2024 15:38:48 +0100 Subject: [PATCH 03/25] Update __donator.dm --- modular_citadel/code/modules/client/loadout/__donator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index d7fa6adcaf..cf5c74a38d 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -42,7 +42,7 @@ name = "Dezir Rose Plush" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/toy/plush/gs13/rose - ckeywhitelist = list("eremitanovem", "sonoida", "Absolutely_Free") + ckeywhitelist = list("eremitanovem", "sonoida", "Absolutely_Free", "absolutely_free", "ABSOLUTELY_FREE") /datum/gear/donator/chloe_plush name = "Chloe Plush" From 05284d7e0a32ae62e0899ffe396dd305b3e261cd Mon Sep 17 00:00:00 2001 From: evilew Date: Thu, 19 Dec 2024 17:49:55 +0100 Subject: [PATCH 04/25] vent clog tweak - generally nerfed the event so it doesn't spill everywhere and it doesn't have such a heavy emphasis on mess-making chemicals - as a future addition, we could just dillute the pool with more 'safe' chems as well tbh --- code/modules/events/vent_clog.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index ee5f4e83f3..b6af06a5f6 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -18,13 +18,13 @@ var/list/saferChems = list( /datum/reagent/water, /datum/reagent/carbon, - /datum/reagent/consumable/flour, + // /datum/reagent/consumable/flour, //GS13 remove: there's already few too many messy reagents there /datum/reagent/space_cleaner, /datum/reagent/consumable/nutriment, /datum/reagent/consumable/condensedcapsaicin, /datum/reagent/drug/mushroomhallucinogen, /datum/reagent/lube, - /datum/reagent/glitter/pink, + // /datum/reagent/glitter/pink, //GS13 tweak: there's already few too many messy reagents there /datum/reagent/glitter/pink_subtle, //GS13 Add: Add our subtle variants of glitter. /datum/reagent/cryptobiolin, //datum/reagent/toxin/plantbgone, //GS13 Remove: Annoying Reagent @@ -42,7 +42,7 @@ /datum/reagent/pax, /datum/reagent/consumable/laughter, /datum/reagent/concentrated_barbers_aid, - /datum/reagent/baldium, + // /datum/reagent/baldium, //gs13 remove: just cruel /datum/reagent/colorful_reagent, /datum/reagent/peaceborg_confuse, /datum/reagent/peaceborg_tire, @@ -67,7 +67,7 @@ priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert", has_important_message = TRUE) /datum/round_event/vent_clog/setup() - end_when = rand(120, 180) + end_when = rand(60, 120) //GS13 - length nerf for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines) var/turf/T = get_turf(temp_vent) var/area/A = T.loc @@ -102,7 +102,7 @@ R.add_reagent(pick(saferChems), reagentsAmount) var/datum/effect_system/smoke_spread/chem/smoke_machine/C = new - C.set_up(R,16,1,T) + C.set_up(R,5,1,T) //GS13 - tweaked size of clouds, from 16 to 5 C.start() playsound(T, 'sound/effects/smoke.ogg', 50, 1, -3) @@ -110,7 +110,7 @@ name = "Clogged Vents: Threatening" typepath = /datum/round_event/vent_clog/threatening weight = 4 - min_players = 18 + min_players = 30 //gs13 tweak max_occurrences = 1 earliest_start = 35 MINUTES description = "Extra dangerous chemicals come out of the scrubbers." @@ -123,7 +123,7 @@ name = "Clogged Vents: Catastrophic" typepath = /datum/round_event/vent_clog/catastrophic weight = 2 - min_players = 25 + min_players = 35 //gs13 tweak max_occurrences = 1 earliest_start = 45 MINUTES description = "EXTREMELY dangerous chemicals come out of the scrubbers." From f3486be2928f9881cac02acae806fc1f0965d215 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:07:57 -0500 Subject: [PATCH 05/25] permafat damage --- GainStation13/code/mechanics/fatness.dm | 8 ++++++++ code/__DEFINES/combat.dm | 2 ++ code/modules/mob/living/carbon/human/species.dm | 2 ++ 3 files changed, 12 insertions(+) diff --git a/GainStation13/code/mechanics/fatness.dm b/GainStation13/code/mechanics/fatness.dm index b2c370571f..4315a6570a 100644 --- a/GainStation13/code/mechanics/fatness.dm +++ b/GainStation13/code/mechanics/fatness.dm @@ -275,3 +275,11 @@ GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/mainten var/fat_to_add = ((amount * CONFIG_GET(number/damage_multiplier)) * FAT_DAMAGE_TO_FATNESS) adjust_fatness(fat_to_add, FATTENING_TYPE_WEAPON) return fat_to_add + +/mob/living/carbon/proc/applyPermaFatnessDamage(amount) + if(!client?.prefs?.weight_gain_permanent) // If we cant apply permafat, apply regular fat + return applyFatnessDamage(amount) + + var/fat_to_add = ((amount * CONFIG_GET(number/damage_multiplier)) * PERMA_FAT_DAMAGE_TO_FATNESS) + adjust_perma(fat_to_add, FATTENING_TYPE_WEAPON) + return fat_to_add diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 4629c4a954..785c83c322 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -277,5 +277,7 @@ // GS13 EDIT #define FAT "fat" +#define PERMA_FAT "perma_fat" /// What is the rate that one damage is converted to fatness? #define FAT_DAMAGE_TO_FATNESS 4 +#define PERMA_FAT_DAMAGE_TO_FATNESS 4 diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 5f2875df34..550d179583 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -2325,6 +2325,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) // GS13 EDIT if(FAT) H.applyFatnessDamage(damage * hit_percent) + if(PERMA_FAT) + H.applyPermaFatnessDamage(damage * hit_percent) return TRUE From 63dbd661e86969a5ec1f2f34ad8f8a8925a119c7 Mon Sep 17 00:00:00 2001 From: evilew Date: Thu, 19 Dec 2024 21:09:56 +0100 Subject: [PATCH 06/25] sec fix double wide door in sec fix --- _maps/map_files/MetaStation/MetaStation.dmm | 44 +++++++++++---------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 067d02df5e..2be59b4655 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -48118,13 +48118,14 @@ /turf/open/floor/plating, /area/maintenance/starboard) "dMm" = ( -/obj/machinery/door/airlock/external{ - name = "Supply Dock Airlock"; - req_access_txt = "31" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/external{ + name = "Supply Dock Airlock"; + req_access_txt = "31"; + dir = 4 + }, /turf/open/floor/plating, /area/cargo/storage) "dNK" = ( @@ -52715,6 +52716,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig"; + req_access_txt = "63" + }, /turf/open/floor/plasteel, /area/security/office) "gzG" = ( @@ -55330,14 +55336,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security/glass{ - bound_width = 64; - doorOpen = 'sound/machines/bigairlockopen.ogg'; - icon = 'icons/obj/doors/airlocks/station/securitydouble.dmi'; id_tag = "innerbrig"; - name = "Security Office"; - note_overlay_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; - overlays_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi'; - req_one_access_txt = "1;4" + name = "Brig"; + req_access_txt = "63" }, /turf/open/floor/plasteel, /area/security/office) @@ -58988,12 +58989,13 @@ /turf/open/floor/plasteel/dark, /area/commons/cryopod) "kff" = ( -/obj/machinery/door/airlock/external{ - name = "Mining Dock Airlock" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/external{ + name = "Mining Dock Airlock"; + dir = 8 + }, /turf/open/floor/plating, /area/cargo/miningoffice) "kfu" = ( @@ -62043,11 +62045,12 @@ /turf/open/floor/plating, /area/construction/storage_wing) "lQC" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock"; - req_access_txt = "48" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + req_access_txt = "48"; dir = 8 }, /turf/open/floor/plasteel, @@ -66379,11 +66382,12 @@ /turf/open/floor/plating, /area/cargo/storage) "otk" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, /obj/machinery/door/airlock/external{ name = "Supply Dock Airlock"; - req_access_txt = "31" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + req_access_txt = "31"; dir = 4 }, /turf/open/floor/plating, From 2402580023471994f2bfbc9c8cb4eff5e9bd88ac Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:43:35 -0500 Subject: [PATCH 07/25] runtime fix --- .../code/modules/food_and_drinks/bigbottle.dm | 1 - GainStation13/icons/obj/device.dmi | Bin 1182 -> 7385 bytes _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 11 ++++------- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/GainStation13/code/modules/food_and_drinks/bigbottle.dm b/GainStation13/code/modules/food_and_drinks/bigbottle.dm index a04875e20e..6ab4ce01f7 100644 --- a/GainStation13/code/modules/food_and_drinks/bigbottle.dm +++ b/GainStation13/code/modules/food_and_drinks/bigbottle.dm @@ -46,7 +46,6 @@ cut_overlays() var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "reagent") if(reagents.reagent_list.len) - var/datum/reagent/R = reagents.get_master_reagent() /*if(!renamedByPlayer) name = "bottle of " + R.name desc = R.glass_desc*/ diff --git a/GainStation13/icons/obj/device.dmi b/GainStation13/icons/obj/device.dmi index b4a729167769d34dce64ca079112a7c8d1886f06..6b6d86e2489fc61634e6a18ed4b987101db15807 100644 GIT binary patch literal 7385 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 oB6gRc7zZMY6ze0Ax|&4!YuXlVUE4 Date: Thu, 19 Dec 2024 15:51:43 -0500 Subject: [PATCH 08/25] Update DeltaStation2.dmm --- _maps/map_files/Deltastation/DeltaStation2.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 8efd2b2683..a694c9b392 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -62,14 +62,14 @@ /turf/open/floor/plating) "aas" = ( /obj/docking_port/stationary/random{ - id = "pod_lavaland1"; + shuttle_id = "pod_lavaland1"; name = "lavaland" }, /turf/open/space, /area/space/nearstation) "aat" = ( /obj/docking_port/stationary/random{ - id = "pod_lavaland2"; + shuttle_id = "pod_lavaland2"; name = "lavaland" }, /turf/open/space, From b9a644d8a4782ddce5a33cd832fe970b9db1b076 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Thu, 19 Dec 2024 16:00:15 -0500 Subject: [PATCH 09/25] Update DeltaStation2.dmm --- _maps/map_files/Deltastation/DeltaStation2.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index a694c9b392..5831767eda 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -392,7 +392,7 @@ dir = 2; dwidth = 4; height = 17; - id = "arrivals_stationary"; + shuttle_id = "arrivals_stationary"; name = "delta arrivals"; roundstart_template = /datum/map_template/shuttle/arrival/delta; width = 9 From e98de30e8b873ba11abd21a7c77037da92783873 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Thu, 19 Dec 2024 16:16:30 -0500 Subject: [PATCH 10/25] moves some files so that CI doesn't scream at us as much --- .../old_map_backups}/gs_maps/BoxStation/BoxStation.dmm | 0 .../old_map_backups}/gs_maps/Deltastation/DeltaStation2.dmm | 0 .../old_map_backups}/gs_maps/KiloStation/KiloStation.dmm | 0 .../old_map_backups}/gs_maps/LayeniaStation/LayeniaStation.dmm | 0 .../old_map_backups}/gs_maps/MetaStation/MetaStation.dmm | 0 .../old_map_backups}/gs_maps/Mining/Lavaland.dmm | 0 .../old_map_backups}/gs_maps/Mining/Lavaland_Demone.dmm | 0 .../old_map_backups}/gs_maps/Mining/Lavaland_Lower.dmm | 0 .../old_map_backups}/gs_maps/OmegaStation/OmegaStation.dmm | 0 .../old_map_backups}/gs_maps/OmegaStation/job_changes.dm | 0 .../old_map_backups}/gs_maps/PubbyStation/PubbyStation.dmm | 0 .../old_map_backups}/gs_maps/PubbyStation/job_changes.dm | 0 .../Lavaland/MiningStation/Mining_Station_Public_01.dmm | 0 .../gs_maps/SyndieBoxStation/SyndieBoxStation.dmm | 0 .../old_map_backups}/gs_maps/debug/multiz.dmm | 0 .../old_map_backups}/gs_maps/debug/runtimestation.dmm | 0 .../old_map_backups}/gs_maps/generic/CentCom.dmm | 0 .../old_map_backups}/gs_maps/generic/City_of_Cogs.dmm | 0 .../old_map_backups}/gs_maps/generic/SpaceDock.dmm | 0 .../old_map_backups}/gs_maps/gs13/Fast_Food.dmm | 0 .../old_map_backups}/gs_maps/gs13/GS13_beach.dmm | 0 .../old_map_backups}/gs_maps/hyper/Diner.dmm | 0 .../old_map_backups}/map_files/BoxStation/BoxStation.dmm | 0 .../old_map_backups}/map_files/CogStation/CogStation.dmm | 0 .../old_map_backups}/map_files/CogStation/job_changes.dm | 0 .../old_map_backups}/map_files/Deltastation/DeltaStation2.dmm | 0 .../old_map_backups}/map_files/FestiveBall/FestiveStation.dmm | 0 .../old_map_backups}/map_files/FestiveBall/doorButtonOrganizer.dm | 0 .../old_map_backups}/map_files/KiloStation/KiloStation.dmm | 0 .../old_map_backups}/map_files/LambdaStation/dorms.dmm | 0 .../old_map_backups}/map_files/LambdaStation/lambda.dmm | 0 .../old_map_backups}/map_files/Mafia/mafia_ayylmao.dmm | 0 .../old_map_backups}/map_files/Mafia/mafia_ball.dmm | 0 .../old_map_backups}/map_files/Mafia/mafia_gothic.dmm | 0 .../old_map_backups}/map_files/Mafia/mafia_lavaland.dmm | 0 .../old_map_backups}/map_files/Mafia/mafia_reebe.dmm | 0 .../old_map_backups}/map_files/Mafia/mafia_snow.dmm | 0 .../old_map_backups}/map_files/Mafia/mafia_spiderclan.dmm | 0 .../old_map_backups}/map_files/Mafia/mafia_syndie.dmm | 0 .../old_map_backups}/map_files/MetaStation/MetaStation.dmm | 0 .../old_map_backups}/map_files/Mining/Lavaland.dmm | 0 .../old_map_backups}/map_files/Mining/Lavaland_Demone.dmm | 0 .../old_map_backups}/map_files/Mining/Lavaland_Lower.dmm | 0 .../old_map_backups}/map_files/OmegaStation/OmegaStation.dmm | 0 .../old_map_backups}/map_files/OmegaStation/job_changes.dm | 0 .../old_map_backups}/map_files/PubbyStation/PubbyStation.dmm | 0 .../old_map_backups}/map_files/PubbyStation/job_changes.dm | 0 .../old_map_backups}/map_files/Snaxi/Snaxi.dmm | 0 .../old_map_backups}/map_files/SpookyStation/SpookyStation.dmm | 0 .../map_files/SpookyStation/halloweenPersiWork.dm | 0 .../old_map_backups}/map_files/SpookyStation/job_changes.dm | 0 .../map_files/SyndicateStation/SyndicateBoxStation.dmm | 0 .../old_map_backups}/map_files/debug/multiz.dmm | 0 .../old_map_backups}/map_files/debug/runtimestation.dmm | 0 .../old_map_backups}/map_files/generic/CentCom.dmm | 0 .../old_map_backups}/map_files/generic/City_of_Cogs.dmm | 0 .../old_map_backups}/map_files/generic/SpaceDock.dmm | 0 .../old_map_backups}/map_files/gs13/Fast_Food.dmm | 0 .../old_map_backups}/map_files/hyper/Diner.dmm | 0 59 files changed, 0 insertions(+), 0 deletions(-) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/BoxStation/BoxStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/Deltastation/DeltaStation2.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/KiloStation/KiloStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/LayeniaStation/LayeniaStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/MetaStation/MetaStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/Mining/Lavaland.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/Mining/Lavaland_Demone.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/Mining/Lavaland_Lower.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/OmegaStation/OmegaStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/OmegaStation/job_changes.dm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/PubbyStation/PubbyStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/PubbyStation/job_changes.dm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/debug/multiz.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/debug/runtimestation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/generic/CentCom.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/generic/City_of_Cogs.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/generic/SpaceDock.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/gs13/Fast_Food.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/gs13/GS13_beach.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/hyper/Diner.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/BoxStation/BoxStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/CogStation/CogStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/CogStation/job_changes.dm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Deltastation/DeltaStation2.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/FestiveBall/FestiveStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/FestiveBall/doorButtonOrganizer.dm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/KiloStation/KiloStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/LambdaStation/dorms.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/LambdaStation/lambda.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_ayylmao.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_ball.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_gothic.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_lavaland.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_reebe.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_snow.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_spiderclan.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_syndie.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/MetaStation/MetaStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mining/Lavaland.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mining/Lavaland_Demone.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mining/Lavaland_Lower.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/OmegaStation/OmegaStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/OmegaStation/job_changes.dm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/PubbyStation/PubbyStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/PubbyStation/job_changes.dm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Snaxi/Snaxi.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/SpookyStation/SpookyStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/SpookyStation/halloweenPersiWork.dm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/SpookyStation/job_changes.dm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/SyndicateStation/SyndicateBoxStation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/debug/multiz.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/debug/runtimestation.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/generic/CentCom.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/generic/City_of_Cogs.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/generic/SpaceDock.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/gs13/Fast_Food.dmm (100%) rename {_maps/old_backups => backup_files/old_map_backups}/map_files/hyper/Diner.dmm (100%) diff --git a/_maps/old_backups/gs_maps/BoxStation/BoxStation.dmm b/backup_files/old_map_backups/gs_maps/BoxStation/BoxStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/BoxStation/BoxStation.dmm rename to backup_files/old_map_backups/gs_maps/BoxStation/BoxStation.dmm diff --git a/_maps/old_backups/gs_maps/Deltastation/DeltaStation2.dmm b/backup_files/old_map_backups/gs_maps/Deltastation/DeltaStation2.dmm similarity index 100% rename from _maps/old_backups/gs_maps/Deltastation/DeltaStation2.dmm rename to backup_files/old_map_backups/gs_maps/Deltastation/DeltaStation2.dmm diff --git a/_maps/old_backups/gs_maps/KiloStation/KiloStation.dmm b/backup_files/old_map_backups/gs_maps/KiloStation/KiloStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/KiloStation/KiloStation.dmm rename to backup_files/old_map_backups/gs_maps/KiloStation/KiloStation.dmm diff --git a/_maps/old_backups/gs_maps/LayeniaStation/LayeniaStation.dmm b/backup_files/old_map_backups/gs_maps/LayeniaStation/LayeniaStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/LayeniaStation/LayeniaStation.dmm rename to backup_files/old_map_backups/gs_maps/LayeniaStation/LayeniaStation.dmm diff --git a/_maps/old_backups/gs_maps/MetaStation/MetaStation.dmm b/backup_files/old_map_backups/gs_maps/MetaStation/MetaStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/MetaStation/MetaStation.dmm rename to backup_files/old_map_backups/gs_maps/MetaStation/MetaStation.dmm diff --git a/_maps/old_backups/gs_maps/Mining/Lavaland.dmm b/backup_files/old_map_backups/gs_maps/Mining/Lavaland.dmm similarity index 100% rename from _maps/old_backups/gs_maps/Mining/Lavaland.dmm rename to backup_files/old_map_backups/gs_maps/Mining/Lavaland.dmm diff --git a/_maps/old_backups/gs_maps/Mining/Lavaland_Demone.dmm b/backup_files/old_map_backups/gs_maps/Mining/Lavaland_Demone.dmm similarity index 100% rename from _maps/old_backups/gs_maps/Mining/Lavaland_Demone.dmm rename to backup_files/old_map_backups/gs_maps/Mining/Lavaland_Demone.dmm diff --git a/_maps/old_backups/gs_maps/Mining/Lavaland_Lower.dmm b/backup_files/old_map_backups/gs_maps/Mining/Lavaland_Lower.dmm similarity index 100% rename from _maps/old_backups/gs_maps/Mining/Lavaland_Lower.dmm rename to backup_files/old_map_backups/gs_maps/Mining/Lavaland_Lower.dmm diff --git a/_maps/old_backups/gs_maps/OmegaStation/OmegaStation.dmm b/backup_files/old_map_backups/gs_maps/OmegaStation/OmegaStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/OmegaStation/OmegaStation.dmm rename to backup_files/old_map_backups/gs_maps/OmegaStation/OmegaStation.dmm diff --git a/_maps/old_backups/gs_maps/OmegaStation/job_changes.dm b/backup_files/old_map_backups/gs_maps/OmegaStation/job_changes.dm similarity index 100% rename from _maps/old_backups/gs_maps/OmegaStation/job_changes.dm rename to backup_files/old_map_backups/gs_maps/OmegaStation/job_changes.dm diff --git a/_maps/old_backups/gs_maps/PubbyStation/PubbyStation.dmm b/backup_files/old_map_backups/gs_maps/PubbyStation/PubbyStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/PubbyStation/PubbyStation.dmm rename to backup_files/old_map_backups/gs_maps/PubbyStation/PubbyStation.dmm diff --git a/_maps/old_backups/gs_maps/PubbyStation/job_changes.dm b/backup_files/old_map_backups/gs_maps/PubbyStation/job_changes.dm similarity index 100% rename from _maps/old_backups/gs_maps/PubbyStation/job_changes.dm rename to backup_files/old_map_backups/gs_maps/PubbyStation/job_changes.dm diff --git a/_maps/old_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm b/backup_files/old_map_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm similarity index 100% rename from _maps/old_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm rename to backup_files/old_map_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm diff --git a/_maps/old_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm b/backup_files/old_map_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm rename to backup_files/old_map_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm diff --git a/_maps/old_backups/gs_maps/debug/multiz.dmm b/backup_files/old_map_backups/gs_maps/debug/multiz.dmm similarity index 100% rename from _maps/old_backups/gs_maps/debug/multiz.dmm rename to backup_files/old_map_backups/gs_maps/debug/multiz.dmm diff --git a/_maps/old_backups/gs_maps/debug/runtimestation.dmm b/backup_files/old_map_backups/gs_maps/debug/runtimestation.dmm similarity index 100% rename from _maps/old_backups/gs_maps/debug/runtimestation.dmm rename to backup_files/old_map_backups/gs_maps/debug/runtimestation.dmm diff --git a/_maps/old_backups/gs_maps/generic/CentCom.dmm b/backup_files/old_map_backups/gs_maps/generic/CentCom.dmm similarity index 100% rename from _maps/old_backups/gs_maps/generic/CentCom.dmm rename to backup_files/old_map_backups/gs_maps/generic/CentCom.dmm diff --git a/_maps/old_backups/gs_maps/generic/City_of_Cogs.dmm b/backup_files/old_map_backups/gs_maps/generic/City_of_Cogs.dmm similarity index 100% rename from _maps/old_backups/gs_maps/generic/City_of_Cogs.dmm rename to backup_files/old_map_backups/gs_maps/generic/City_of_Cogs.dmm diff --git a/_maps/old_backups/gs_maps/generic/SpaceDock.dmm b/backup_files/old_map_backups/gs_maps/generic/SpaceDock.dmm similarity index 100% rename from _maps/old_backups/gs_maps/generic/SpaceDock.dmm rename to backup_files/old_map_backups/gs_maps/generic/SpaceDock.dmm diff --git a/_maps/old_backups/gs_maps/gs13/Fast_Food.dmm b/backup_files/old_map_backups/gs_maps/gs13/Fast_Food.dmm similarity index 100% rename from _maps/old_backups/gs_maps/gs13/Fast_Food.dmm rename to backup_files/old_map_backups/gs_maps/gs13/Fast_Food.dmm diff --git a/_maps/old_backups/gs_maps/gs13/GS13_beach.dmm b/backup_files/old_map_backups/gs_maps/gs13/GS13_beach.dmm similarity index 100% rename from _maps/old_backups/gs_maps/gs13/GS13_beach.dmm rename to backup_files/old_map_backups/gs_maps/gs13/GS13_beach.dmm diff --git a/_maps/old_backups/gs_maps/hyper/Diner.dmm b/backup_files/old_map_backups/gs_maps/hyper/Diner.dmm similarity index 100% rename from _maps/old_backups/gs_maps/hyper/Diner.dmm rename to backup_files/old_map_backups/gs_maps/hyper/Diner.dmm diff --git a/_maps/old_backups/map_files/BoxStation/BoxStation.dmm b/backup_files/old_map_backups/map_files/BoxStation/BoxStation.dmm similarity index 100% rename from _maps/old_backups/map_files/BoxStation/BoxStation.dmm rename to backup_files/old_map_backups/map_files/BoxStation/BoxStation.dmm diff --git a/_maps/old_backups/map_files/CogStation/CogStation.dmm b/backup_files/old_map_backups/map_files/CogStation/CogStation.dmm similarity index 100% rename from _maps/old_backups/map_files/CogStation/CogStation.dmm rename to backup_files/old_map_backups/map_files/CogStation/CogStation.dmm diff --git a/_maps/old_backups/map_files/CogStation/job_changes.dm b/backup_files/old_map_backups/map_files/CogStation/job_changes.dm similarity index 100% rename from _maps/old_backups/map_files/CogStation/job_changes.dm rename to backup_files/old_map_backups/map_files/CogStation/job_changes.dm diff --git a/_maps/old_backups/map_files/Deltastation/DeltaStation2.dmm b/backup_files/old_map_backups/map_files/Deltastation/DeltaStation2.dmm similarity index 100% rename from _maps/old_backups/map_files/Deltastation/DeltaStation2.dmm rename to backup_files/old_map_backups/map_files/Deltastation/DeltaStation2.dmm diff --git a/_maps/old_backups/map_files/FestiveBall/FestiveStation.dmm b/backup_files/old_map_backups/map_files/FestiveBall/FestiveStation.dmm similarity index 100% rename from _maps/old_backups/map_files/FestiveBall/FestiveStation.dmm rename to backup_files/old_map_backups/map_files/FestiveBall/FestiveStation.dmm diff --git a/_maps/old_backups/map_files/FestiveBall/doorButtonOrganizer.dm b/backup_files/old_map_backups/map_files/FestiveBall/doorButtonOrganizer.dm similarity index 100% rename from _maps/old_backups/map_files/FestiveBall/doorButtonOrganizer.dm rename to backup_files/old_map_backups/map_files/FestiveBall/doorButtonOrganizer.dm diff --git a/_maps/old_backups/map_files/KiloStation/KiloStation.dmm b/backup_files/old_map_backups/map_files/KiloStation/KiloStation.dmm similarity index 100% rename from _maps/old_backups/map_files/KiloStation/KiloStation.dmm rename to backup_files/old_map_backups/map_files/KiloStation/KiloStation.dmm diff --git a/_maps/old_backups/map_files/LambdaStation/dorms.dmm b/backup_files/old_map_backups/map_files/LambdaStation/dorms.dmm similarity index 100% rename from _maps/old_backups/map_files/LambdaStation/dorms.dmm rename to backup_files/old_map_backups/map_files/LambdaStation/dorms.dmm diff --git a/_maps/old_backups/map_files/LambdaStation/lambda.dmm b/backup_files/old_map_backups/map_files/LambdaStation/lambda.dmm similarity index 100% rename from _maps/old_backups/map_files/LambdaStation/lambda.dmm rename to backup_files/old_map_backups/map_files/LambdaStation/lambda.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_ayylmao.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_ayylmao.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_ayylmao.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_ayylmao.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_ball.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_ball.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_ball.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_ball.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_gothic.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_gothic.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_gothic.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_gothic.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_lavaland.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_lavaland.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_lavaland.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_lavaland.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_reebe.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_reebe.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_reebe.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_reebe.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_snow.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_snow.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_snow.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_snow.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_spiderclan.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_spiderclan.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_spiderclan.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_spiderclan.dmm diff --git a/_maps/old_backups/map_files/Mafia/mafia_syndie.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_syndie.dmm similarity index 100% rename from _maps/old_backups/map_files/Mafia/mafia_syndie.dmm rename to backup_files/old_map_backups/map_files/Mafia/mafia_syndie.dmm diff --git a/_maps/old_backups/map_files/MetaStation/MetaStation.dmm b/backup_files/old_map_backups/map_files/MetaStation/MetaStation.dmm similarity index 100% rename from _maps/old_backups/map_files/MetaStation/MetaStation.dmm rename to backup_files/old_map_backups/map_files/MetaStation/MetaStation.dmm diff --git a/_maps/old_backups/map_files/Mining/Lavaland.dmm b/backup_files/old_map_backups/map_files/Mining/Lavaland.dmm similarity index 100% rename from _maps/old_backups/map_files/Mining/Lavaland.dmm rename to backup_files/old_map_backups/map_files/Mining/Lavaland.dmm diff --git a/_maps/old_backups/map_files/Mining/Lavaland_Demone.dmm b/backup_files/old_map_backups/map_files/Mining/Lavaland_Demone.dmm similarity index 100% rename from _maps/old_backups/map_files/Mining/Lavaland_Demone.dmm rename to backup_files/old_map_backups/map_files/Mining/Lavaland_Demone.dmm diff --git a/_maps/old_backups/map_files/Mining/Lavaland_Lower.dmm b/backup_files/old_map_backups/map_files/Mining/Lavaland_Lower.dmm similarity index 100% rename from _maps/old_backups/map_files/Mining/Lavaland_Lower.dmm rename to backup_files/old_map_backups/map_files/Mining/Lavaland_Lower.dmm diff --git a/_maps/old_backups/map_files/OmegaStation/OmegaStation.dmm b/backup_files/old_map_backups/map_files/OmegaStation/OmegaStation.dmm similarity index 100% rename from _maps/old_backups/map_files/OmegaStation/OmegaStation.dmm rename to backup_files/old_map_backups/map_files/OmegaStation/OmegaStation.dmm diff --git a/_maps/old_backups/map_files/OmegaStation/job_changes.dm b/backup_files/old_map_backups/map_files/OmegaStation/job_changes.dm similarity index 100% rename from _maps/old_backups/map_files/OmegaStation/job_changes.dm rename to backup_files/old_map_backups/map_files/OmegaStation/job_changes.dm diff --git a/_maps/old_backups/map_files/PubbyStation/PubbyStation.dmm b/backup_files/old_map_backups/map_files/PubbyStation/PubbyStation.dmm similarity index 100% rename from _maps/old_backups/map_files/PubbyStation/PubbyStation.dmm rename to backup_files/old_map_backups/map_files/PubbyStation/PubbyStation.dmm diff --git a/_maps/old_backups/map_files/PubbyStation/job_changes.dm b/backup_files/old_map_backups/map_files/PubbyStation/job_changes.dm similarity index 100% rename from _maps/old_backups/map_files/PubbyStation/job_changes.dm rename to backup_files/old_map_backups/map_files/PubbyStation/job_changes.dm diff --git a/_maps/old_backups/map_files/Snaxi/Snaxi.dmm b/backup_files/old_map_backups/map_files/Snaxi/Snaxi.dmm similarity index 100% rename from _maps/old_backups/map_files/Snaxi/Snaxi.dmm rename to backup_files/old_map_backups/map_files/Snaxi/Snaxi.dmm diff --git a/_maps/old_backups/map_files/SpookyStation/SpookyStation.dmm b/backup_files/old_map_backups/map_files/SpookyStation/SpookyStation.dmm similarity index 100% rename from _maps/old_backups/map_files/SpookyStation/SpookyStation.dmm rename to backup_files/old_map_backups/map_files/SpookyStation/SpookyStation.dmm diff --git a/_maps/old_backups/map_files/SpookyStation/halloweenPersiWork.dm b/backup_files/old_map_backups/map_files/SpookyStation/halloweenPersiWork.dm similarity index 100% rename from _maps/old_backups/map_files/SpookyStation/halloweenPersiWork.dm rename to backup_files/old_map_backups/map_files/SpookyStation/halloweenPersiWork.dm diff --git a/_maps/old_backups/map_files/SpookyStation/job_changes.dm b/backup_files/old_map_backups/map_files/SpookyStation/job_changes.dm similarity index 100% rename from _maps/old_backups/map_files/SpookyStation/job_changes.dm rename to backup_files/old_map_backups/map_files/SpookyStation/job_changes.dm diff --git a/_maps/old_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm b/backup_files/old_map_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm similarity index 100% rename from _maps/old_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm rename to backup_files/old_map_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm diff --git a/_maps/old_backups/map_files/debug/multiz.dmm b/backup_files/old_map_backups/map_files/debug/multiz.dmm similarity index 100% rename from _maps/old_backups/map_files/debug/multiz.dmm rename to backup_files/old_map_backups/map_files/debug/multiz.dmm diff --git a/_maps/old_backups/map_files/debug/runtimestation.dmm b/backup_files/old_map_backups/map_files/debug/runtimestation.dmm similarity index 100% rename from _maps/old_backups/map_files/debug/runtimestation.dmm rename to backup_files/old_map_backups/map_files/debug/runtimestation.dmm diff --git a/_maps/old_backups/map_files/generic/CentCom.dmm b/backup_files/old_map_backups/map_files/generic/CentCom.dmm similarity index 100% rename from _maps/old_backups/map_files/generic/CentCom.dmm rename to backup_files/old_map_backups/map_files/generic/CentCom.dmm diff --git a/_maps/old_backups/map_files/generic/City_of_Cogs.dmm b/backup_files/old_map_backups/map_files/generic/City_of_Cogs.dmm similarity index 100% rename from _maps/old_backups/map_files/generic/City_of_Cogs.dmm rename to backup_files/old_map_backups/map_files/generic/City_of_Cogs.dmm diff --git a/_maps/old_backups/map_files/generic/SpaceDock.dmm b/backup_files/old_map_backups/map_files/generic/SpaceDock.dmm similarity index 100% rename from _maps/old_backups/map_files/generic/SpaceDock.dmm rename to backup_files/old_map_backups/map_files/generic/SpaceDock.dmm diff --git a/_maps/old_backups/map_files/gs13/Fast_Food.dmm b/backup_files/old_map_backups/map_files/gs13/Fast_Food.dmm similarity index 100% rename from _maps/old_backups/map_files/gs13/Fast_Food.dmm rename to backup_files/old_map_backups/map_files/gs13/Fast_Food.dmm diff --git a/_maps/old_backups/map_files/hyper/Diner.dmm b/backup_files/old_map_backups/map_files/hyper/Diner.dmm similarity index 100% rename from _maps/old_backups/map_files/hyper/Diner.dmm rename to backup_files/old_map_backups/map_files/hyper/Diner.dmm From 3ffca10009d8c0cd1cfb885a26c6a11d76ad2b07 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Thu, 19 Dec 2024 16:45:54 -0500 Subject: [PATCH 11/25] Update DeltaStation2.dmm --- _maps/map_files/Deltastation/DeltaStation2.dmm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5831767eda..6a467ccfa8 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1454,7 +1454,7 @@ dir = 8; dwidth = 12; height = 17; - id = "syndicate_ne"; + shuttle_id = "syndicate_ne"; name = "northeast of station"; width = 23 }, @@ -1465,7 +1465,7 @@ dir = 8; dwidth = 11; height = 15; - id = "whiteship_home"; + shuttle_id = "whiteship_home"; name = "SS13: Auxiliary Dock, Station-Fore"; width = 32 }, @@ -1777,7 +1777,7 @@ dir = 1; dwidth = 2; height = 13; - id = "ferry_home"; + shuttle_id = "ferry_home"; name = "port bay 2"; width = 5 }, @@ -12461,7 +12461,7 @@ dir = 4; dwidth = 4; height = 7; - id = "supply_home"; + shuttle_id = "supply_home"; name = "Cargo Bay"; width = 12 }, @@ -26243,7 +26243,7 @@ "bbz" = ( /obj/docking_port/stationary/random{ dir = 4; - id = "pod_lavaland4"; + shuttle_id = "pod_lavaland4"; name = "lavaland" }, /turf/open/space, @@ -29021,7 +29021,7 @@ dir = 4; dwidth = 3; height = 5; - id = "mining_home"; + shuttle_id = "mining_home"; name = "mining shuttle bay"; roundstart_template = /datum/map_template/shuttle/mining/delta; width = 7 @@ -39820,7 +39820,7 @@ dir = 8; dwidth = 2; height = 5; - id = "laborcamp_home"; + shuttle_id = "laborcamp_home"; name = "fore bay 1"; roundstart_template = /datum/map_template/shuttle/labour/delta; width = 9 @@ -113910,7 +113910,7 @@ dir = 4; dwidth = 11; height = 18; - id = "emergency_home"; + shuttle_id = "emergency_home"; name = "DeltaStation emergency evac bay"; width = 30 }, @@ -118015,7 +118015,7 @@ dir = 4; dwidth = 4; height = 9; - id = "aux_base_zone"; + shuttle_id = "aux_base_zone"; name = "aux base zone"; roundstart_template = /datum/map_template/shuttle/aux_base/default; width = 9 From 54035436633e7b302663b9a51b331301a4d23fba Mon Sep 17 00:00:00 2001 From: AbsFree Date: Fri, 20 Dec 2024 23:43:11 +0100 Subject: [PATCH 12/25] hopefully fixed the SM just delaming for no reason even when inactive --- code/modules/power/supermatter/supermatter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 8790113ba6..3a38a18c6e 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -602,7 +602,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) //Varies based on power and gas content removed.adjust_moles(GAS_PLASMA, clamp((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0, 50)) //Varies based on power, gas content, and heat - removed.adjust_moles(GAS_O2, clamp((device_energy * dynamic_heat_modifier + effective_temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0, 100)) + removed.adjust_moles(GAS_O2, clamp((device_energy * dynamic_heat_modifier + effective_temperature - T20C) / OXYGEN_RELEASE_MODIFIER, 0, 100)) if(removed.return_temperature() < max_temp_increase) removed.adjust_heat(device_energy * dynamic_heat_modifier * THERMAL_RELEASE_MODIFIER) From 494435be0eed924d03d0a9a678c0810d8100902e Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sat, 21 Dec 2024 15:42:00 +0100 Subject: [PATCH 13/25] fixed engi lathe not being able to craft the RPD, added double O2 tank --- .../autolathe_designs_sec_and_hacked.dm | 4 ++-- code/modules/research/designs/misc_designs.dm | 10 ++++++++++ .../research/techweb/nodes/engineering_nodes.dm | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index bf9d5886a0..1c8bd86a31 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -58,9 +58,9 @@ build_path = /obj/item/construction/rcd category = list("hacked", "Construction") -/datum/design/rpd +/datum/design/rpd_autolathe name = "Rapid Pipe Dispenser (RPD)" - id = "rpd" + id = "rpd_autolathe" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500) build_path = /obj/item/pipe_dispenser diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 6f6a1fd88e..cf4a37fd9b 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -742,6 +742,16 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +/datum/design/double_emergency_oxygen_engi + name = "Double Engineering Emergency Oxygen Tank" + desc = "An double emergency oxygen tank for engineers." + id = "double_emergency_oxygen_engi" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1500, /datum/material/silver = 200) + build_path = /obj/item/tank/internals/emergency_oxygen/double/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + ///////////////////////////////////////// /////////////////Tape//////////////////// ///////////////////////////////////////// diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 51b9480c27..7089af61b5 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -16,8 +16,8 @@ display_name = "Advanced Engineering" description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") - design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", - "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier") + design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", "rpd_autolathe", + "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier", "double_emergency_oxygen_engi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000) /datum/techweb_node/anomaly From 924e5c28bd15e5cbd10d18a8741203c069a2fa0b Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sat, 21 Dec 2024 16:24:37 +0100 Subject: [PATCH 14/25] added beanbag chair recipes and deconstruction --- GainStation13/code/structures/chair.dm | 1 + code/game/objects/items/stacks/sheets/sheet_types.dm | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/GainStation13/code/structures/chair.dm b/GainStation13/code/structures/chair.dm index b139dffbbb..c9dfb731cd 100644 --- a/GainStation13/code/structures/chair.dm +++ b/GainStation13/code/structures/chair.dm @@ -63,6 +63,7 @@ icon_state = "beanbag" color = "#ffffff" anchored = FALSE + buildstacktype = /obj/item/stack/sheet/cloth buildstackamount = 5 item_chair = null diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 8d96b2c88e..f9a250ed7d 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -412,6 +412,16 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("19x19 canvas", /obj/item/canvas/nineteenXnineteen, 3), \ new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythreeXnineteen, 4), \ new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythreeXtwentythree, 5), \ + null, \ + // new/datum/stack_recipe("Beanbag chair", /obj/structure/chair/beanbag, 5), + new/datum/stack_recipe_list("beanbag chairs", list( \ + new/datum/stack_recipe("red beanbag chair", /obj/structure/chair/beanbag/red, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("blue beanbag chair", /obj/structure/chair/beanbag/blue, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("green beanbag chair",/obj/structure/chair/beanbag/green, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("purple beanbag chair", /obj/structure/chair/beanbag/purple, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("black beanbag chair", /obj/structure/chair/beanbag/black, 5, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("GATO beanbag chair", /obj/structure/chair/beanbag/gato, 5, one_per_turf = TRUE, on_floor = TRUE), \ + )), \ )) /obj/item/stack/sheet/cloth From 379100ddbe2e0f2015f6c52349d530161e00630f Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sat, 21 Dec 2024 21:34:15 +0100 Subject: [PATCH 15/25] addeda comment, commit because git bullies me :( --- code/game/objects/items/stacks/sheets/sheet_types.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index f9a250ed7d..041f02168e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -413,7 +413,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("23x19 canvas", /obj/item/canvas/twentythreeXnineteen, 4), \ new/datum/stack_recipe("23x23 canvas", /obj/item/canvas/twentythreeXtwentythree, 5), \ null, \ - // new/datum/stack_recipe("Beanbag chair", /obj/structure/chair/beanbag, 5), + // GS13 edit - beanbag chairs new/datum/stack_recipe_list("beanbag chairs", list( \ new/datum/stack_recipe("red beanbag chair", /obj/structure/chair/beanbag/red, 5, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("blue beanbag chair", /obj/structure/chair/beanbag/blue, 5, one_per_turf = TRUE, on_floor = TRUE), \ @@ -422,6 +422,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("black beanbag chair", /obj/structure/chair/beanbag/black, 5, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("GATO beanbag chair", /obj/structure/chair/beanbag/gato, 5, one_per_turf = TRUE, on_floor = TRUE), \ )), \ + // END GS13 edit )) /obj/item/stack/sheet/cloth From 9397bf71cac5ac494c1afcd6e0144b0231aa8cfd Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 22 Dec 2024 01:22:18 +0100 Subject: [PATCH 16/25] beanbag chairs deconstructible with wirecutters, all other chairs deconstructible with wrench --- code/game/objects/structures/beds_chairs/chair.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 40613aa96b..8debdaa03f 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -77,7 +77,12 @@ qdel(src) /obj/structure/chair/attackby(obj/item/W, mob/user, params) - if(W.tool_behaviour == TOOL_WRENCH && !(flags_1 & NODECONSTRUCT_1)) + // GS13 EDIT - replaced wrench check with a check based on material and tool - chairs made from any material other + // than cloth will function the same as before, but chairs made from cloth will be destructible using a wirecutter + var/wrench_deconstruct = W.tool_behaviour == TOOL_WRENCH && buildstacktype != /obj/item/stack/sheet/cloth + var/wirecutter_deconstruct = W.tool_behaviour == TOOL_WIRECUTTER && buildstacktype == /obj/item/stack/sheet/cloth + if((wrench_deconstruct || wirecutter_deconstruct) && !(flags_1 & NODECONSTRUCT_1)) + // GS13 END EDIT W.play_tool_sound(src) deconstruct() else if(istype(W, /obj/item/assembly/shock_kit)) From 22165a20f1378ffba6ee246836c7e11e545fd538 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 22 Dec 2024 09:56:08 +0100 Subject: [PATCH 17/25] changed node names to make it easier to look for them --- code/modules/research/designs/stock_parts_designs.dm | 4 ++-- code/modules/research/designs/tool_designs.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 7392f83975..ad3f070587 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -3,7 +3,7 @@ //////////////////////////////////////// /datum/design/RPED - name = "Rapid Part Exchange Device" + name = "Rapid Part Exchange Device (RPED)" desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" build_type = PROTOLATHE @@ -13,7 +13,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE /datum/design/BS_RPED - name = "Bluespace RPED" + name = "Bluespace Rapid Part Exchange Device (RPED)" desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first." id = "bs_rped" build_type = PROTOLATHE diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index 5ef050efe9..b451e101f0 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -33,7 +33,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING /datum/design/rpd - name = "Rapid Pipe Dispenser" + name = "Rapid Pipe Dispenser (RPD)" desc = "A tool that can construct and deconstruct pipes on the fly." id = "rpd" build_type = PROTOLATHE From 30a68aa1b035968113296324201d1082b90ae669 Mon Sep 17 00:00:00 2001 From: AbsFree Date: Sun, 22 Dec 2024 12:46:27 +0100 Subject: [PATCH 18/25] advanced engineering research node no longershows 2 rpd's --- code/modules/research/designs/tool_designs.dm | 2 +- code/modules/research/techweb/nodes/engineering_nodes.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index b451e101f0..e83e50f431 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -33,7 +33,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING /datum/design/rpd - name = "Rapid Pipe Dispenser (RPD)" + name = "Rapid Piping Device (RPD)" desc = "A tool that can construct and deconstruct pipes on the fly." id = "rpd" build_type = PROTOLATHE diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 7089af61b5..a9864ac50c 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -16,7 +16,7 @@ display_name = "Advanced Engineering" description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") - design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", "rpd_autolathe", + design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier", "double_emergency_oxygen_engi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000) From 3bd4b1a4575ff0c2c9332a18aba49e168aad4f94 Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:04 -0500 Subject: [PATCH 19/25] Update code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm --- .../autolathe_desings/autolathe_designs_sec_and_hacked.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index 1c8bd86a31..f1afd7d9d5 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -58,7 +58,7 @@ build_path = /obj/item/construction/rcd category = list("hacked", "Construction") -/datum/design/rpd_autolathe +/datum/design/rpd_autolathe //ORIGINAL /datum/design/rpd name = "Rapid Pipe Dispenser (RPD)" id = "rpd_autolathe" build_type = AUTOLATHE | NO_PUBLIC_LATHE From 7af1c41411e82ec656e5b5e727a5b84096180040 Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:14 -0500 Subject: [PATCH 20/25] Update code/modules/research/designs/misc_designs.dm --- code/modules/research/designs/misc_designs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index cf4a37fd9b..e5efcdc6e1 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -742,6 +742,7 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +//GS13 EDIT START /datum/design/double_emergency_oxygen_engi name = "Double Engineering Emergency Oxygen Tank" desc = "An double emergency oxygen tank for engineers." @@ -751,6 +752,7 @@ build_path = /obj/item/tank/internals/emergency_oxygen/double/empty category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +//GS13 EDIT END ///////////////////////////////////////// /////////////////Tape//////////////////// From f77aaba85833168942db8a7e182b82bdce6dbb3d Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:21 -0500 Subject: [PATCH 21/25] Update code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm --- .../autolathe_desings/autolathe_designs_sec_and_hacked.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index f1afd7d9d5..6fd1cd2ef5 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -60,7 +60,7 @@ /datum/design/rpd_autolathe //ORIGINAL /datum/design/rpd name = "Rapid Pipe Dispenser (RPD)" - id = "rpd_autolathe" + id = "rpd_autolathe" // ORIGINAL id = "rpd" build_type = AUTOLATHE | NO_PUBLIC_LATHE materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500) build_path = /obj/item/pipe_dispenser From c08690cd6d1d2a8a050d028ae2d4ab002e17d03f Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:29 -0500 Subject: [PATCH 22/25] Update code/modules/research/designs/stock_parts_designs.dm --- code/modules/research/designs/stock_parts_designs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index ad3f070587..889e5b7c7d 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -3,6 +3,7 @@ //////////////////////////////////////// /datum/design/RPED + // ORIGINAL name = "Rapid Part Exchange Device" name = "Rapid Part Exchange Device (RPED)" desc = "Special mechanical module made to store, sort, and apply standard machine parts." id = "rped" From d56b15f7fa0c36e465bd8da1f65820e0f0d837fe Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:38 -0500 Subject: [PATCH 23/25] Update code/modules/research/designs/stock_parts_designs.dm --- code/modules/research/designs/stock_parts_designs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 889e5b7c7d..e4934a1f85 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -14,6 +14,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE /datum/design/BS_RPED + // ORIGINAL name = "Bluespace RPED" name = "Bluespace Rapid Part Exchange Device (RPED)" desc = "Powered by bluespace technology, this RPED variant can upgrade buildings from a distance, without needing to remove the panel first." id = "bs_rped" From b6964b6f9225e5cfb06be36efa9da02edcaef1da Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:45 -0500 Subject: [PATCH 24/25] Update code/modules/research/designs/tool_designs.dm --- code/modules/research/designs/tool_designs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index e83e50f431..7ed2969926 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -33,6 +33,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING /datum/design/rpd + // ORIGINAL name = "Rapid Pipe Dispenser" name = "Rapid Piping Device (RPD)" desc = "A tool that can construct and deconstruct pipes on the fly." id = "rpd" From 4e87d46f890f82da32e7dcca7c4c16a0af62451d Mon Sep 17 00:00:00 2001 From: sheepishgoat <100518708+sheepishgoat@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:02:51 -0500 Subject: [PATCH 25/25] Update code/modules/research/techweb/nodes/engineering_nodes.dm --- code/modules/research/techweb/nodes/engineering_nodes.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index a9864ac50c..15feb89149 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -17,6 +17,7 @@ description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", + // ORIGINAL "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier") "rcd_upgrade_frames", "rcd_upgrade_simple_circuits", "rcd_ammo_large", "sheetifier", "double_emergency_oxygen_engi") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000)