From d8b559e5937b7b393d49e3617e31ed5987cf76ce Mon Sep 17 00:00:00 2001 From: Fluff Date: Wed, 24 May 2023 20:01:45 -0400 Subject: [PATCH 01/37] Buffing Zaddat a tad, along with giving Zorren and Fennec traits Will write in github proper --- .../human/species/station/station_ch.dm | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm new file mode 100644 index 0000000000..9f217290aa --- /dev/null +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm @@ -0,0 +1,50 @@ +//There is already a station file, but feels wrong to put zaddat balancing changes with the restriction file, and feels wrong to lump them in with a modular station_vr so hello station_ch file + +/datum/species/zaddat + toxins_mod = 0.5 //toxins rarely come into play, and zaddat just has negatives. Along with their parasite letting them survive in their polluted planet, this seems reasonable. + +//So both of this are based off Fennec foxes I belivive. Those are desert critters, giving them more warm focused levels. And for variety giving them minor brute weakness and minor burn resistant +//I also want to make a dig because fennec foxes actually make burrows and such, but I can't figure out how to do it in a way that is both flavorful but not abuseable +/datum/species/hi_zoxxen //zorrens get wierd chemistry because of their past of expirementing on themselves. Check the cataloguer for deathclaws + chem_strength_heal = 1.5 + chemOD_threshold = 0.5 + brute_mod = 1.1 + burn_mod = 0.9 + + cold_level_1 = 270 //Default 260 - Lower is better + cold_level_2 = 210 //Default 200 + cold_level_3 = 120 //Default 120 + + breath_cold_level_1 = 250 //Default 240 - Lower is better + breath_cold_level_2 = 190 //Default 180 + breath_cold_level_3 = 100 //Default 100 + + heat_level_1 = 400 //Default 360 - Higher is better + heat_level_2 = 460 //Default 400 + heat_level_3 = 1080 //Default 1000 + + breath_heat_level_1 = 430 //Default 380 - Higher is better + breath_heat_level_2 = 510 //Default 450 + breath_heat_level_3 = 1200 //Default 1250 + +/datum/species/fl_zorren + item_slowdown_mod = 1.2 + slowdown = 1.2 + brute_mod = 1.1 + burn_mod = 0.9 + + cold_level_1 = 270 //Default 260 - Lower is better + cold_level_2 = 210 //Default 200 + cold_level_3 = 120 //Default 120 + + breath_cold_level_1 = 250 //Default 240 - Lower is better + breath_cold_level_2 = 190 //Default 180 + breath_cold_level_3 = 100 //Default 100 + + heat_level_1 = 400 //Default 360 - Higher is better + heat_level_2 = 460 //Default 400 + heat_level_3 = 1080 //Default 1000 + + breath_heat_level_1 = 430 //Default 380 - Higher is better + breath_heat_level_2 = 510 //Default 450 + breath_heat_level_3 = 1200 //Default 1250 \ No newline at end of file From 663e77d0fc279132a7ef63b349a7af5b96a88bbd Mon Sep 17 00:00:00 2001 From: Fluff Date: Wed, 24 May 2023 20:16:19 -0400 Subject: [PATCH 02/37] Wait 1.5 might be too much 1.5 might be too much --- .../mob/living/carbon/human/species/station/station_ch.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm index 9f217290aa..7b7ae131da 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm @@ -6,7 +6,7 @@ //So both of this are based off Fennec foxes I belivive. Those are desert critters, giving them more warm focused levels. And for variety giving them minor brute weakness and minor burn resistant //I also want to make a dig because fennec foxes actually make burrows and such, but I can't figure out how to do it in a way that is both flavorful but not abuseable /datum/species/hi_zoxxen //zorrens get wierd chemistry because of their past of expirementing on themselves. Check the cataloguer for deathclaws - chem_strength_heal = 1.5 + chem_strength_heal = 1.3 chemOD_threshold = 0.5 brute_mod = 1.1 burn_mod = 0.9 From a55fc146f31a71133397ac9c0299476043fdac0e Mon Sep 17 00:00:00 2001 From: Fluff Date: Wed, 24 May 2023 20:36:05 -0400 Subject: [PATCH 03/37] And to push a bit further on the OD line of things 1.3 OD damage --- .../mob/living/carbon/human/species/station/station_ch.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm index 7b7ae131da..f680f23429 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm @@ -8,6 +8,7 @@ /datum/species/hi_zoxxen //zorrens get wierd chemistry because of their past of expirementing on themselves. Check the cataloguer for deathclaws chem_strength_heal = 1.3 chemOD_threshold = 0.5 + chemOD_mod = 1.3 brute_mod = 1.1 burn_mod = 0.9 From ec7b1b15ee1a5bbbef27ef9e635089a039a4b7c2 Mon Sep 17 00:00:00 2001 From: Fluff Date: Wed, 24 May 2023 20:41:40 -0400 Subject: [PATCH 04/37] AGGG AGGG --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index 2d81a578b5..3364534261 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4624,6 +4624,7 @@ #include "modular_chomp\code\modules\mob\living\carbon\human\species\outsider\vox.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\prommie_blob.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\station.dm" +#include "modular_chomp\code\modules\mob\living\carbon\human\species\station\station_ch.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\station_special_ch.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\teshari.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\protean\_protean_defines.dm" From de1211af61cce4d787b5f615d66c482110d87c0a Mon Sep 17 00:00:00 2001 From: Fluff Date: Thu, 25 May 2023 23:44:29 -0400 Subject: [PATCH 05/37] Fixed Fennec slow down and now zorrens take double OD damage Title --- .../mob/living/carbon/human/species/station/station_ch.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm index f680f23429..af52f255b8 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm @@ -8,7 +8,7 @@ /datum/species/hi_zoxxen //zorrens get wierd chemistry because of their past of expirementing on themselves. Check the cataloguer for deathclaws chem_strength_heal = 1.3 chemOD_threshold = 0.5 - chemOD_mod = 1.3 + chemOD_mod = 2 brute_mod = 1.1 burn_mod = 0.9 @@ -30,7 +30,7 @@ /datum/species/fl_zorren item_slowdown_mod = 1.2 - slowdown = 1.2 + slowdown = -0.2 brute_mod = 1.1 burn_mod = 0.9 From cc31ca401276e6ca2d1dc77450d835d4f84f5e58 Mon Sep 17 00:00:00 2001 From: Fluff Date: Tue, 30 May 2023 11:00:23 -0400 Subject: [PATCH 06/37] Swapping Zorren suggestion Swapped chem buff to radiation resist --- .../mob/living/carbon/human/species/station/station_ch.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm index af52f255b8..21e1c1f04f 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm @@ -6,9 +6,8 @@ //So both of this are based off Fennec foxes I belivive. Those are desert critters, giving them more warm focused levels. And for variety giving them minor brute weakness and minor burn resistant //I also want to make a dig because fennec foxes actually make burrows and such, but I can't figure out how to do it in a way that is both flavorful but not abuseable /datum/species/hi_zoxxen //zorrens get wierd chemistry because of their past of expirementing on themselves. Check the cataloguer for deathclaws - chem_strength_heal = 1.3 - chemOD_threshold = 0.5 - chemOD_mod = 2 + chemOD_threshold = 0.75 + radiation_mod = 0.5 brute_mod = 1.1 burn_mod = 0.9 From a15329be0cab40b84de88a2d6fbd8e8a2fbda848 Mon Sep 17 00:00:00 2001 From: Rykka Stormheart Date: Tue, 6 Jun 2023 15:15:49 -0700 Subject: [PATCH 07/37] [BUGFIX] Replaces middle ear ring loop with truly silent loop I'd meant to get around to this for months, but work and life has been in the way. I finally, finally have time and energy to start fixing shit. --- code/datums/looping_sounds/mob_sounds.dm | 2 +- modular_chomp/sound/misc/silence.ogg | Bin 0 -> 2662 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 modular_chomp/sound/misc/silence.ogg diff --git a/code/datums/looping_sounds/mob_sounds.dm b/code/datums/looping_sounds/mob_sounds.dm index ef997b22e8..b4f70d86be 100644 --- a/code/datums/looping_sounds/mob_sounds.dm +++ b/code/datums/looping_sounds/mob_sounds.dm @@ -12,7 +12,7 @@ /datum/looping_sound/mob/deafened start_sound = 'modular_chomp/sound/effects/ear_ring/ear_deaf_in.ogg' start_length = 4 SECONDS // 2 seconds shorter than the actual file ending, bc we want it to overlap - mid_sounds = list('modular_chomp/sound/effects/ear_ring/ear_deaf_loop.ogg'=1) + mid_sounds = list('modular_chomp/sound/effects/misc/silence.ogg'=1) mid_length = 3 SECONDS end_sound = 'modular_chomp/sound/effects/ear_ring/ear_deaf_out.ogg' volume = 40 diff --git a/modular_chomp/sound/misc/silence.ogg b/modular_chomp/sound/misc/silence.ogg new file mode 100644 index 0000000000000000000000000000000000000000..41ee44cd04b0eb806b75e72ed7a88c02ffdcd100 GIT binary patch literal 2662 zcmcIme@qiu9)CrY0+m#*vK4XDs$Dx^U51rg%jFWN;?gN9PDRT!=5AYhTH2yg@S=O< zI4S6|UAK$VF7Bb>N2jrc=}MP&W8LFCwN)!=xJrvBy6WWwq`0@2%f?H*WbaL3O)j~A z?s zVRpVA%uW{M4*s@4lKnGgRciQ`E$S$OkV=2_@RmJIhXh8wW`9bvKrSdLMoWrIir*24 z_m~>>N1JqJU1KxCsAVl*+?p%fz8`940S?X+iq9C!Jb093cI}uS0R<_l+{YP9d|%V%Trbfl?hbWZ{{gF<(VSmE^l+5V(z@wf$m(V zjS|=eZ32bsa9rMR=9m3SRL?8h8Jg4lrnt;LAQO+>`UZb4>F82-{b4F!nUq-g3jLqh z@0(xv;}5Zh5MOIW!=b+_#iu50wJ9f*r?XNvX8~}%hEut>jRDG6fHuIZJjT0qtl+)w zjd#;hOUeP`eDT?*;_eOd?)o~1uFl~);kb0g^Y$z6mZbN^d@#q-Ih+n|1HkVTp8iHY zZd2OiZy~kgQg;9MInrmm`WPPW(OCCJZAuQh9POMyI=GX&r4(m9dwbP|`lvwh^SLLQ z*=^i>-+FKco@TAE3d1%t2U{U*IxD{|*b$W?7szT%OpiL`nG$^6GH;&#euv8%- zzInHFMo`ZwoGGwyN|+eJBx2>s`h`VlZQEF&eWU(!Nyl?c?D0H1;d*}F zz$T9r1Y$5FHqL;Dvi% zM3}w9uUyIbzAsO`Gx1G>7Gx`Qt}>b`1yq^woHd+@;2uBmvddaCvPfa&oYkgfeoqNCQ) z@;K3|>uI@A9E1i17LuOL$uVy-T$~IR4+l;E_R`rmhLYhCD112fNyGHmck==C>tJKS z)yr%D_~KP~#O*Qt-aC|Z6(xhlhDFjzR2Dl4|F_@w+s$VhmU06h`oD!41hLP2F&uG zM9O~*@d_b(wU%2L7Ff7=me9EmT_M!wVBrFii^+v#37%q4FYcK;;g<&I93^UQ8d`vHK#s~;Z;wIWpY=DPbEAI53!!fxVo-xx)=9Cql zZ|}wsx4j!5?l~8$5R2Nan4I!=V?~RqI&i{3$9r%^DcKEGh2R;qKVMl?+EIgN!-|3C z`u7_eB!L>4q2HOOC`A2vT6j1g0?u4D;tu7hKc@XErJ~f)tufN^`E$6Q9Nz5;x^wLtw7d5YLm#ql_3k@^>i4W!@6oby9b|PVclc#1bj5p94jts_0 z1+$w9B0BFaG++_2oL-Tpkaf{`ic z(0vW8s{Cy5r12Z?!7>?-Gf`r45XUlwkb>m_ZwINRP%w3~C|fF?lJ4)n2P5l^Tc2KE#)VI=G>}#ee#bg>YA-v@vWm^T z!T=lm3xKMuwlilA&v0_Mxx74ne!-i9^&3;@(v+Th45pVavCLx-7CCt1*T+ZGSn$XH EA5F7AZvX%Q literal 0 HcmV?d00001 From 09355f5df1033f94ec9b05d55cd989c61aa33afd Mon Sep 17 00:00:00 2001 From: Rykka Stormheart <54187424+Rykka-Stormheart@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:26:11 -0700 Subject: [PATCH 08/37] Update mob_sounds.dm --- code/datums/looping_sounds/mob_sounds.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/looping_sounds/mob_sounds.dm b/code/datums/looping_sounds/mob_sounds.dm index b4f70d86be..1a3d6fcf93 100644 --- a/code/datums/looping_sounds/mob_sounds.dm +++ b/code/datums/looping_sounds/mob_sounds.dm @@ -12,7 +12,7 @@ /datum/looping_sound/mob/deafened start_sound = 'modular_chomp/sound/effects/ear_ring/ear_deaf_in.ogg' start_length = 4 SECONDS // 2 seconds shorter than the actual file ending, bc we want it to overlap - mid_sounds = list('modular_chomp/sound/effects/misc/silence.ogg'=1) + mid_sounds = list('modular_chomp/sound/misc/silence.ogg'=1) mid_length = 3 SECONDS end_sound = 'modular_chomp/sound/effects/ear_ring/ear_deaf_out.ogg' volume = 40 From 3468c70ebff9073e9e7ff40da998d74232b25b20 Mon Sep 17 00:00:00 2001 From: Digi Purpur Date: Tue, 13 Jun 2023 12:21:02 -0700 Subject: [PATCH 09/37] Foxtaur Squats GET THAT WORKOUT IN BB --- icons/mob/vore/taurs_ch_loaf.dmi | Bin 733 -> 8503 bytes .../mob/new_player/sprite_accessories_taur.dm | 3 +++ 2 files changed, 3 insertions(+) diff --git a/icons/mob/vore/taurs_ch_loaf.dmi b/icons/mob/vore/taurs_ch_loaf.dmi index 2b4c0acbdc5d81cc73e07b8827cdfeb9c7a26665..a31792069fd5936d10ddd889bc4a7fda5ac5b880 100644 GIT binary patch literal 8503 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 Date: Tue, 13 Jun 2023 13:35:53 -0700 Subject: [PATCH 10/37] GPS Text and Spelling Fixes The GPS on/off text was reversed and this fixes it. Along with a couple others. The largest "change" is the change of posessed to possessed (since it requires an actual file-name change.) --- code/_helpers/global_lists_vr.dm | 2 +- code/game/objects/items/blueprints_vr.dm | 2 +- code/game/objects/items/bodybag.dm | 2 +- code/game/objects/items/devices/gps.dm | 4 ++-- code/game/objects/items/devices/paicard_ch.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 2 +- .../subtypes/humanoid/{posessed_ch.dm => possessed_ch.dm} | 0 vorestation.dme | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename code/modules/mob/living/simple_mob/subtypes/humanoid/{posessed_ch.dm => possessed_ch.dm} (100%) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index a14c8420b4..fac6c341df 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -978,7 +978,7 @@ var/global/list/selectable_speech_bubbles = list( "tentacles", "heart", "textbox", - "posessed", + "possessed", "square", "medical", "medical_square", diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 92231894d9..a9a0159f84 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -241,7 +241,7 @@ /obj/item/areaeditor/blueprints/engineers name = "writing blueprints" - desc = "A piece of paper that allows for expansion of the station and creaiton of new areas. There is a \"For Official Use Only\" stamp on it. NOT to be mistaken with the staion blueprints." + desc = "A piece of paper that allows for expansion of the station and creation of new areas. There is a \"For Official Use Only\" stamp on it. NOT to be mistaken with the station blueprints." station_master = 0 uses_charges = 1 can_override = 0 diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index b88785b9fc..d5c77f8ecf 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -128,7 +128,7 @@ /obj/item/bodybag/cryobag name = "stasis bag" desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \ - especially useful if short on time or in a hostile enviroment." + especially useful if short on time or in a hostile environment." icon = 'icons/obj/closets/cryobag.dmi' icon_state = "bodybag_folded" item_state = "bodybag_cryo_folded" diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 980685f124..c7a15cc957 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -140,9 +140,9 @@ var/list/GPS_list = list() toggle_tracking() if(tracking) - to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.") - else to_chat(user, "[src] is now tracking, and visible to other GPS devices.") + else + to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.") /obj/item/device/gps/proc/toggle_tracking() tracking = !tracking diff --git a/code/game/objects/items/devices/paicard_ch.dm b/code/game/objects/items/devices/paicard_ch.dm index b6ce0d69d8..8bb271053c 100644 --- a/code/game/objects/items/devices/paicard_ch.dm +++ b/code/game/objects/items/devices/paicard_ch.dm @@ -14,5 +14,5 @@ if("Cancel") return else if (istype(W, /obj/item/weapon/card/id) && src.pai.idaccessible == 0) - to_chat(user, "[src] is not accepting access modifcations at this time.") + to_chat(user, "[src] is not accepting access modifications at this time.") return \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 304f7b234f..5c2d3d0c56 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -500,7 +500,7 @@ if("Cancel") return else if (istype(W, /obj/item/weapon/card/id) && idaccessible == 0) - to_chat(user, "[src] is not accepting access modifcations at this time.") + to_chat(user, "[src] is not accepting access modifications at this time.") return /mob/living/silicon/pai/verb/allowmodification() diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/possessed_ch.dm similarity index 100% rename from code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm rename to code/modules/mob/living/simple_mob/subtypes/humanoid/possessed_ch.dm diff --git a/vorestation.dme b/vorestation.dme index df8cf33d54..c6b9a1880c 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3312,7 +3312,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\humanoid\humanoid_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates_ch.dm" -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\posessed_ch.dm" +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\possessed_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\russian.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs_ch.dm" From ca19ab2abd66eea03cd8d0fec952bbf0548fef4c Mon Sep 17 00:00:00 2001 From: Raeschen Date: Tue, 13 Jun 2023 22:46:01 +0200 Subject: [PATCH 11/37] Fix a merge conflict --- config/jukebox.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/jukebox.json b/config/jukebox.json index e50ef49715..7bea866c53 100644 --- a/config/jukebox.json +++ b/config/jukebox.json @@ -4698,11 +4698,8 @@ "artist": "That Handsome Devil", "secret": false, "lobby": false, -<<<<<<< HEAD "jukebox": true, "genre": "Rock" -======= -"jukebox": true }, { "url": "https://files.catbox.moe/8r5d7q.mp3", @@ -4713,7 +4710,6 @@ "secret": true, "lobby": false, "jukebox": true ->>>>>>> ae542d5642... Merge pull request #14950 from Runa-Dacino/fixjukeboxjson }, { "url": "https://files.catbox.moe/2ozzmg.m4a", From 7cd7646f9917d547ad78bb9e0cd317046cb52d3a Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 13:53:08 -0700 Subject: [PATCH 12/37] Update global_lists_vr.dm Added missing comment. --- code/_helpers/global_lists_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index fac6c341df..b20655163e 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -978,7 +978,7 @@ var/global/list/selectable_speech_bubbles = list( "tentacles", "heart", "textbox", - "possessed", + "possessed", // purdev (spelling changed <3) "square", "medical", "medical_square", From 6d067b6e70a789941e61c735b740b2f9333a25f6 Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:02:41 -0700 Subject: [PATCH 13/37] Update blueprints_vr.dm Added missing comments. --- code/game/objects/items/blueprints_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index a9a0159f84..f45c0a70af 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -241,7 +241,7 @@ /obj/item/areaeditor/blueprints/engineers name = "writing blueprints" - desc = "A piece of paper that allows for expansion of the station and creation of new areas. There is a \"For Official Use Only\" stamp on it. NOT to be mistaken with the station blueprints." + desc = "A piece of paper that allows for expansion of the station and creation of new areas. There is a \"For Official Use Only\" stamp on it. NOT to be mistaken with the station blueprints." // purdev (some spelling fixes) station_master = 0 uses_charges = 1 can_override = 0 From 984423633e4357a6a20783f2f76aea472b876167 Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:04:03 -0700 Subject: [PATCH 14/37] Update bodybag.dm Added missing comment. --- code/game/objects/items/bodybag.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index d5c77f8ecf..e26dfded4f 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -128,7 +128,7 @@ /obj/item/bodybag/cryobag name = "stasis bag" desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \ - especially useful if short on time or in a hostile environment." + especially useful if short on time or in a hostile environment." // purdev (spelling fix) icon = 'icons/obj/closets/cryobag.dmi' icon_state = "bodybag_folded" item_state = "bodybag_cryo_folded" From d6dff02608f1e0ab7c7527badf2f21f3092e398e Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:06:00 -0700 Subject: [PATCH 15/37] Update gps.dm Added missing comment(s). --- code/game/objects/items/devices/gps.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index c7a15cc957..8e58588411 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -140,9 +140,9 @@ var/list/GPS_list = list() toggle_tracking() if(tracking) - to_chat(user, "[src] is now tracking, and visible to other GPS devices.") - else - to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.") + to_chat(user, "[src] is now tracking, and visible to other GPS devices.") // purdev Fixed an issue where the if/else argument was written backwards + else // purdev Fixed an issue where the if/else argument was written backwards + to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.") // purdev Fixed an issue where the if/else argument was written backwards /obj/item/device/gps/proc/toggle_tracking() tracking = !tracking From 11cb4b2bde5611c7c51a8f8a713edebc8a22c7ae Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:08:33 -0700 Subject: [PATCH 16/37] Update pai.dm Added missing comment. --- code/modules/mob/living/silicon/pai/pai.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 5c2d3d0c56..3faee13c03 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -500,7 +500,7 @@ if("Cancel") return else if (istype(W, /obj/item/weapon/card/id) && idaccessible == 0) - to_chat(user, "[src] is not accepting access modifications at this time.") + to_chat(user, "[src] is not accepting access modifications at this time.") // purdev (spelling fix) return /mob/living/silicon/pai/verb/allowmodification() From 5585311d8a93cc7b7effa22f42db092224dc42b4 Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:10:38 -0700 Subject: [PATCH 17/37] Update vorestation.dme Adding (correct) comments this time. --- vorestation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vorestation.dme b/vorestation.dme index c6b9a1880c..575144078f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3312,7 +3312,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\humanoid\humanoid_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates_ch.dm" -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\possessed_ch.dm" +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\possessed_ch.dm" // CHOMPEDIT : purdev spelling fix #include "code\modules\mob\living\simple_mob\subtypes\humanoid\russian.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs_ch.dm" From 64c343ec0e2253ff9f69c3a312d8139b1afbad37 Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:11:14 -0700 Subject: [PATCH 18/37] Update global_lists_vr.dm Fixed the comment <3 --- code/_helpers/global_lists_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index b20655163e..a00418f2dc 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -978,7 +978,7 @@ var/global/list/selectable_speech_bubbles = list( "tentacles", "heart", "textbox", - "possessed", // purdev (spelling changed <3) + "possessed", // CHOMPEDIT : purdev (spelling changed <3) "square", "medical", "medical_square", From f945b957902aa24645ead52e0450b06c7c9b834a Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:11:40 -0700 Subject: [PATCH 19/37] Update blueprints_vr.dm Fixed the comment <3 --- code/game/objects/items/blueprints_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index f45c0a70af..6d9dece697 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -241,7 +241,7 @@ /obj/item/areaeditor/blueprints/engineers name = "writing blueprints" - desc = "A piece of paper that allows for expansion of the station and creation of new areas. There is a \"For Official Use Only\" stamp on it. NOT to be mistaken with the station blueprints." // purdev (some spelling fixes) + desc = "A piece of paper that allows for expansion of the station and creation of new areas. There is a \"For Official Use Only\" stamp on it. NOT to be mistaken with the station blueprints." // CHOMPEDIT : purdev (some spelling fixes) station_master = 0 uses_charges = 1 can_override = 0 From 0425181669e21829d273e9d92849a24a07c4379e Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:12:10 -0700 Subject: [PATCH 20/37] Update bodybag.dm Fixed the comment <3 --- code/game/objects/items/bodybag.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index e26dfded4f..806056810e 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -128,7 +128,7 @@ /obj/item/bodybag/cryobag name = "stasis bag" desc = "A non-reusable plastic bag designed to slow down bodily functions such as circulation and breathing, \ - especially useful if short on time or in a hostile environment." // purdev (spelling fix) + especially useful if short on time or in a hostile environment." // CHOMPEDIT : purdev (spelling fix) icon = 'icons/obj/closets/cryobag.dmi' icon_state = "bodybag_folded" item_state = "bodybag_cryo_folded" From 0d98a543f4143952f6da2c61da464f3d32670454 Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:12:46 -0700 Subject: [PATCH 21/37] Update gps.dm Fixed the comment(s) <3 --- code/game/objects/items/devices/gps.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 8e58588411..71bb7c0dd5 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -140,9 +140,9 @@ var/list/GPS_list = list() toggle_tracking() if(tracking) - to_chat(user, "[src] is now tracking, and visible to other GPS devices.") // purdev Fixed an issue where the if/else argument was written backwards - else // purdev Fixed an issue where the if/else argument was written backwards - to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.") // purdev Fixed an issue where the if/else argument was written backwards + to_chat(user, "[src] is now tracking, and visible to other GPS devices.") // CHOMPEDIT : purdev Fixed an issue where the if/else argument was written backwards + else // CHOMPEDIT : purdev Fixed an issue where the if/else argument was written backwards + to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.") // CHOMPEDIT : purdev Fixed an issue where the if/else argument was written backwards /obj/item/device/gps/proc/toggle_tracking() tracking = !tracking From 64b47796ca4c573c5372f2e855c729972c84a37a Mon Sep 17 00:00:00 2001 From: FoxglovePurpur <125158082+FoxglovePurpur@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:13:27 -0700 Subject: [PATCH 22/37] Update pai.dm Fixed the comment <3 --- code/modules/mob/living/silicon/pai/pai.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 3faee13c03..5167d5becd 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -500,7 +500,7 @@ if("Cancel") return else if (istype(W, /obj/item/weapon/card/id) && idaccessible == 0) - to_chat(user, "[src] is not accepting access modifications at this time.") // purdev (spelling fix) + to_chat(user, "[src] is not accepting access modifications at this time.") // CHOMPEDIT : purdev (spelling fix) return /mob/living/silicon/pai/verb/allowmodification() From 82159bd428e82aedd780aba7535a8976f1a55875 Mon Sep 17 00:00:00 2001 From: Rykka Stormheart Date: Wed, 14 Jun 2023 09:43:32 -0700 Subject: [PATCH 23/37] Fix errant comment breaking .dme --- vorestation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vorestation.dme b/vorestation.dme index 575144078f..c6b9a1880c 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3312,7 +3312,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\humanoid\humanoid_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\pirates_ch.dm" -#include "code\modules\mob\living\simple_mob\subtypes\humanoid\possessed_ch.dm" // CHOMPEDIT : purdev spelling fix +#include "code\modules\mob\living\simple_mob\subtypes\humanoid\possessed_ch.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\russian.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs.dm" #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs_ch.dm" From 71d7a3547cd6780a36aab10a8e0f57ff358006a3 Mon Sep 17 00:00:00 2001 From: Digi Purpur Date: Wed, 14 Jun 2023 10:14:44 -0700 Subject: [PATCH 24/37] Loaf Fix:tm: Fixed the forward facing loaf. --- icons/mob/vore/taurs_ch_loaf.dmi | Bin 8503 -> 8471 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/vore/taurs_ch_loaf.dmi b/icons/mob/vore/taurs_ch_loaf.dmi index a31792069fd5936d10ddd889bc4a7fda5ac5b880..c1b90e5831bf53a864a933d9421cd3e372864256 100644 GIT binary patch delta 7721 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 Date: Fri, 16 Jun 2023 07:01:03 +1000 Subject: [PATCH 25/37] Merge pull request #15026 from Enzo-Leon/weapons-tune Re-adjusts Altevian Weapons --- code/modules/projectiles/guns/energy/altevian_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/altevian_vr.dm b/code/modules/projectiles/guns/energy/altevian_vr.dm index 150d05c421..4208d2d9e2 100644 --- a/code/modules/projectiles/guns/energy/altevian_vr.dm +++ b/code/modules/projectiles/guns/energy/altevian_vr.dm @@ -10,7 +10,7 @@ origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) matter = list(MAT_STEEL = 1000) projectile_type = /obj/item/projectile/beam/meeplaser - charge_cost = 150 + charge_cost = 450 /obj/item/weapon/gun/energy/altevian/large name = "Proto-Reactive Beam Thruster" @@ -23,7 +23,7 @@ origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 4) matter = list(MAT_STEEL = 2000) projectile_type = /obj/item/projectile/beam/meeplaser/strong - charge_cost = 300 + charge_cost = 200 /obj/item/projectile/beam/meeplaser name = "meep beam" From 5a2b7dd32c957765da410b58d9fa8ddd8d562f21 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:30:17 +1000 Subject: [PATCH 27/37] Merge pull request #15029 from Runa-Dacino/disposals feature: Adds admin logging to disposals incidents --- code/game/objects/stumble_into_vr.dm | 3 ++- code/modules/recycling/disposal.dm | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/objects/stumble_into_vr.dm b/code/game/objects/stumble_into_vr.dm index 610afea550..2079ab5a42 100644 --- a/code/game/objects/stumble_into_vr.dm +++ b/code/game/objects/stumble_into_vr.dm @@ -23,6 +23,7 @@ /obj/machinery/disposal/stumble_into(mob/living/M) playsound(src, 'sound/effects/clang.ogg', 25, 1, -1) visible_message("[M] [pick("tripped", "stumbled")] into \the [src]!") + log_and_message_admins("stumbled into \the [src]", M) if(M.client) M.client.perspective = EYE_PERSPECTIVE M.client.eye = src @@ -141,4 +142,4 @@ /obj/machinery/vending/stumble_into(mob/living/M) ..() if(prob(2)) - throw_item() \ No newline at end of file + throw_item() diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index a27e2cc384..bb7847fd0a 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -142,6 +142,8 @@ user.drop_item() if(I) + if(istype(I, /obj/item/weapon/holder/micro)) + log_and_message_admins("placed [I.name] inside \the [src]", user) I.forceMove(src) to_chat(user, "You place \the [I] into the [src].") @@ -181,6 +183,7 @@ // must be awake, not stunned or whatever msg = "[user.name] climbs into the [src]." to_chat(user, "You climb into the [src].") + log_and_message_admins("climbed into disposals!", user) else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) msg = "[user.name] stuffs [target.name] into the [src]!" to_chat(user, "You stuff [target.name] into the [src]!") @@ -527,6 +530,8 @@ . = ..() if(istype(AM, /obj/item) && !istype(AM, /obj/item/projectile)) if(prob(75)) + if(istype(AM, /obj/item/weapon/holder/micro)) + log_and_message_admins("[AM] was thrown into \the [src]") AM.forceMove(src) visible_message("\The [AM] lands in \the [src].") else @@ -541,6 +546,8 @@ return if(prob(75)) I.forceMove(src) + if(istype(I, /obj/item/weapon/holder/micro)) + log_and_message_admins("[I.name] was thrown into \the [src]") for(var/mob/M in viewers(src)) M.show_message("\The [I] lands in \the [src].", 3) else From 286ddeb7ccbd5feb0125e571d04b87e8acb72578 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 16 Jun 2023 16:29:48 +1000 Subject: [PATCH 29/37] Merge pull request #15030 from Youtubeboy139/saw_fix Fixes the invisible Alien Saw --- icons/obj/abductor.dmi | Bin 270092 -> 270091 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi index db935ef7d4a4728c140f4402ba54a961003b51d3..e5ffc375a39c4e2dcfd815b80e9e08fb14be03fa 100644 GIT binary patch delta 632 zcmV-;0*C#Kz7UJP5RfDRgpnm80hEzQ9e>M9_fQZ5L||sP+$XQax5pn(FXG|(Dcd3i z?W|adyPHKe>$QrFSc%&*n>DC6P26olgot7#u5{}S*m#xAl%^n7qR3`zf);oGd)yX7 ztU^REu}K3<*Ve!b2W`+wBo?^Qzgt(eK(C3=Ai=WGChbPSYn5PQFuFw+g{@CG5Pzk{ zz-w(b3E@ZxaI38fjg!20x0=B4F)&~ii|UIRXI&w&3) zuI6JN(V%xU5r<_qQ)u8_tVEH2tbr?`MS>~>^^O#u_xLM{!Ugj6>kD{q1PJ zMud?-M#m>??JQQ(KteAEqtVVisJT{#ZxsVvrejYd?}v1}&5OLq%j52%bbs(@Lqd(# z$am?`AjUb=s!Q@>)CQ}I(0lEwOh|8y=U6?Ol*h#mHg^+t zl?Nw`YlN^@q_;>FoTh#~m>z$d(5G)?2%(h|Z>EtI_xb(EGvxXjrY^Y{8L-TY&ub*p z#fUU99c~X)4kl6CnW&?4d{C>{BP+sn+8eS)!*`Z_+BOI(OwIAnrCk{(Uy-V$#y@88 zwV_FNI$=cYaFv1(9#4juW delta 633 zcmV-<0*3vIz7UMQ5RfDRg^?v90pyWL9e*oJ_fQZ5L||sP+$XQaw}&5(&*J{+G20;p z?W|af+nYr;>$QrFSc_$u%^K9(Chj*OLPW6^SGx5EY`n^5N>dPPQDn0XL5utU18#>Q zRv{vo*rb7_Yirs`!pqE5wkYHJ8lXj!vwMwut7~LX^!qz7oh<{RJ z;I+2fgm5GTxYbsL#!240J56Bt7#OgMMfJ`qBv0-V=&#uEfgRxAyUpejb%V&qXTbj? zSMxECXwW;Fh{GzIDKzjV)}qMY*T9v~B0&{_wm2bBjszBYu^5q^4bF@VydBZL474&o ztP}EF{u>>PM(e>RRL%gcdPj;+{C~Yu&f8VqjtwjF#my>T+^q54mE!V30*{b<86~*Jn{!O*t!rC z#t~s8kkRoOTRV%DG?38D!DzH|4{ENJ;d{jZm+9E^$h#pQmwAyFd3oAilz$E$ZAd86 z8u>OI8pJqS@1qgrAh!r&OG(g3nkznv~bY9yWIq zc9lmbjBA9jSEP4H6`ZGjJsKZ>yU>SkWC)>^6OX2m6?ggF$TQ^n8m2C}7#Xn2i;rt0 z)5VB1F&>sjDo3NJ?M&3sIZ?h<9FP^^ChZYfqv1QtA#EE36{ZIH$I`BhlP^eBQs*Bt z_}b7UJDo5i_P9zx3)`s%z&v2yC42*6q8`r*T#JY2dvX8tnEe4bA*7hJIgCn!u>yy& T0s)7y0s@Dz0t2_P0t8wdOLQ*N From cf690461db50aa4438ac52c04338e14bde5b915c Mon Sep 17 00:00:00 2001 From: Seris02 Date: Fri, 16 Jun 2023 16:47:05 +0800 Subject: [PATCH 31/37] ip whitelists --- code/controllers/configuration_ch.dm | 18 ++++++++++++++++++ code/modules/mob/login.dm | 4 ++++ config/example/ip_whitelist.txt | 4 ++++ 3 files changed, 26 insertions(+) create mode 100644 config/example/ip_whitelist.txt diff --git a/code/controllers/configuration_ch.dm b/code/controllers/configuration_ch.dm index b119f5fdbd..c11b4b6fff 100644 --- a/code/controllers/configuration_ch.dm +++ b/code/controllers/configuration_ch.dm @@ -17,6 +17,8 @@ var/discord_ahelps_disabled = 0 //Turn this off if you don't want the TGS bot sending you messages whenever an ahelp ticket is created. var/discord_ahelps_all = 0 //Turn this on if you want all admin-PMs to go to be sent to discord, and not only the first message of a ticket. + var/list/ip_whitelist = list() + /hook/startup/proc/read_ch_config() var/list/Lines = file2list("config/config.txt") for(var/t in Lines) @@ -62,4 +64,20 @@ config.nodebot_location = value if ("ahelp_channel_tag") config.ahelp_channel_tag = value + + var/list/ip_whitelist_lines = file2list("config/ip_whitelist.txt") + var/increment = 1 + for(var/t in ip_whitelist_lines) + if (!t) continue + t = trim(t) + if (length(t) == 0) + continue + else if (copytext(t, 1, 2) == "#") + continue + var/ip_address = splittext(t, ",") + for (var/name in ip_address) + config.ip_whitelist[name] = increment + increment += 1 + + return 1 diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 374690c5bd..004f6f332f 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -9,6 +9,10 @@ if(M == src) continue if( M.key && (M.key != key) ) var/matches + //CHOMPEDIT - IP exemptions for those who are known to live together + if (config.ip_whitelist[key] && config.ip_whitelist[key] == config.ip_whitelist[M.key]) + continue + //CHOMPEDIT end if( (M.lastKnownIP == client.address) ) matches += "IP ([client.address])" if( (client.connection != "web") && (M.computer_id == client.computer_id) ) diff --git a/config/example/ip_whitelist.txt b/config/example/ip_whitelist.txt new file mode 100644 index 0000000000..788b4ebd8a --- /dev/null +++ b/config/example/ip_whitelist.txt @@ -0,0 +1,4 @@ +# this file is for exempting certain groups of keys from recieving the "you're already in the game go away" message when they connect with the same IP (ie, living together) +# each group should be on the same line, separated by a comma (and nothing else), and each group should be on a separate line +# EXAMPLE (remove the # and it would be valid): +#somekey1,somekey2,somekey3 \ No newline at end of file From cece4d3f61b997010d074f45930a470aa8a637c9 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 16 Jun 2023 22:26:02 +1000 Subject: [PATCH 32/37] Merge pull request #15034 from Youtubeboy139/cyborg_saw_fix The cyborg can has a saw... as a treat --- icons/obj/surgery_vr.dmi | Bin 20436 -> 20562 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/surgery_vr.dmi b/icons/obj/surgery_vr.dmi index 6b6b4dbbb8f5125f34df19dae4b40474567982c5..1e3d7677db5fb129210cc5b772347e61926d9d4e 100644 GIT binary patch literal 20562 zcmb5WbyyYO7d|?Kbc1vwp`>(!v^1!6HzFZjhwcT?k?$W4v2I&9O^gt`QH27 zzwYz==HbN5>@#Q2UTeSWUGLh5a8+elOf*t7001!G%1NmM0Gv4ZphiIgkMx+89D_T> zp6|7srOcg79jzUlt?lgqz&$Tw(1ah60Y^K`{>+JEP9J$$Rh z&`mpNi~G&uEh%P0-Un^Wzv)87EbiwV6(n$=e{Osh;0Z1I^sRU6qbv5b5e6S&)0Xq= zO`Y*+rs)#3z|D!An1YizPar%;1L1d)8BxAi{XPOuqJgBwSC5~`l}x$jtD`;1zt#pq zNypnFO?^IdVK$*EKmve?BaW)%-b?uxI#buIfRd63|RHOqTJrG??iS5 zhozT%qvQGa@S{9e4R@o2ACRhNWp-MXDS*&I($2M=R)+vHuchBAP2{qVS25|r2PJmj zg71as)9zEt+!pW1B!}LTElS0;001@cR_e`r_w<7d554yr4}D^m7IU~A&!nWgpN*9% zHrLi0XD6-@It_|cDx~Tf4DTr^u(JAoNZDe^JR3?sOF61a-&*@BPfv`2)b%`0;1==ejW$y{ z1Ri`9cC=Xv=ec!ptz63!C9*V%z2ibK<4A>T;5qy&A@kiu$PJxgcp35Fo9{E=?$q6x z&XU4WePCWFqjhw)N_0CfzRFDy!tV9aEcYVy$Y*swLm4V0^cYp3qU@8cbnA*`O}{qJ zPwBOhISt22jFBV_2fR$}We(YXdv$r%fdi1Vih9C4_Bu-wY*aQL7& z1Lt|m(>g!2Y%q&a-q9riIk{}KFv2_}+>NZ8<&m^;aD5<&p`)koaiI6zQyqv|E>xk? zxL1qSz`ZulkI!Y#>KHN*_S8EfvUsIGE4=d=^R-m*-)(fO`V=bOEYqiBA<1J$7wfU) z5I9VWnfo!^mfIBhSsoQnJxP9{M~tnw_;?AKC}KDWdvR7D*T-tM5XoJDHJUcRcY;a& zBg@m9`5Q}))K?lLS)obD!p*{@Eqozg8MZe!;Oab;PP|Oztl`nv-I$t}$o@OAf5){y z*x8lz^Z3}jy!uO4tp?R-A|ws%@^{-jl2y!jicQFj(MYsi1&LOmfQ)4YiB4eE*{B1C z$@(PEn~-yqXlfWOx9-r;SnG;Uv~C34J#GXmUsX0lLvS?tp2MyyAdt+U)q&mc-DxTlBxf;a^ zRmMIlahivmUpJ03MEe{@oG*r*A1Q$+o5mGf&XrQ&L|W~trE|sV!cBwLrz!baw!KE& z{kORUD+S)wTqq^eJe}X!zte?pxq(}%C@p2yES)|ExA3T_PwYv9PIfEJ)|&W^&mj8i zrgPXWE`E(Yj16g*(ew!e*GYN|&3qyG($)>da6}E6i@W@eM;l12aLy zLTV~03BW{v#uqHHh6T7Ctw{I9P?QTaPs856ecM%ZqiR;3Uzz3-^pL`3SuH9C+s^I0 zy`))oIC7=bslz5rgpDm1@bql-@baoVy}Y!`S7llPEqI5A zhd1`qRJLilgJc5P@9S5B=KD(ukv8#ckQyOGeR8y&J2w)h$n|pou81 zV4A(&6K9@}<5o5f`brewz9QuwQO3#6 z&`wf8MRAu10<4kBRN|yC0;SDhanN>W$q)oqsXbHc861eGc+jh_iBbw9!%zX~0B?!N#9( z7ONweh>=2gjj8Z^A-RV9_qlhBzuHg?FkIZ1&{&}oC2*moK6?@Vx{y+3w^8)<$cV4g zYE~bTvWO-9z=It^Xvz*2)#<=@Shd|T`!)LSlEENzZS8g0F6YT}+etlbvZ_RUc3bH| zz_+-P?DY6-90YKppW{1RA}9Ft1Wvmo*2`bhGGk{Fa2mtxogsYp`XaE+sjBftfriYw znFQ*_uxRDXo$ySi?BsW&+xvHQh<^?3{{rpfOL{L?V!zWrHZmfXYdukCZ&-SnP%_OYAVA`Kw}Jg2 z$#!h~5DNGu1sF)QQLgd(vSMxzRUU4U#5|8}2`5r+^_x$fkKbNIU_~GpU4D(&{8^hT zh6?hhOMM-GR38`dp|@tU;RCEYFrTm0{V>L0HF_}h^W8Q+RU&C77$B`ky)QGDk!H1F z1ff&WFX$>_+fjQ^fp!HocGR7%(g~bz*wj>VF@MC`j_1(>Xn3Evg*rahEJl7ZvJ^&3 z_%IJbvAyR#P7ZBaLREcW?nyx%j={Ejh@GEUyliy9Y~8J_Q0eczCqVU)fk#2rxK= zg~`Ppu5)K`r@!!X)_u7PA9~%^J`3k6;{Ue@CiT%dgKWiD^xmn12@b%E zmN3KC!cFe5g5O_hSv2Frmy|Yp_g+JTSH7wm+K zA3v}->Ux(;R#r2XZC;@Irie~j!W0eVAyt^*@eIBG{wf)&Z9>IQ_jt*olWpl<$mD(g z>-_!O>b?H!W?u%Jp@TuTfLr1t;g`q7Z@aL&Tv0<{JN^so863@>x+F@N48k?(NZY*h zYP$E{7VZyo!-CQCo!9(+zSB@3eLG~!9^)V_Q<=Eu6v}z3qGTZaGEJ|ytsB3Z=Tl$G zkk}qlmlf~Wb|}K^aq9{O=`uN|GKYU+Kt6dX$8J8KE=!Ml%*l9%jXS4bAvt21?8=3Riji#qx1S6{;86Eh+#!Hu7^|<#EAd1K4$=zSs*7nG$o)nba}?o_d48c(>t1%Vl-yyaQSDt_X`@zZCD}p@?97sF5Uh|F&uS^=OgqKUWXk7DM| z-tJ`Dca1xzi}I}MFe#KbWQOcG64Xseqo?dYTLt94Jql*lB9e!8{(9B_+>z-oTK`|~ z*M_;{;`)UlI{L^i8Kk7qGTT_D^3WW?_A5~Vqv-+m`$ehJOHhs`ZwXuhgq8Cz9^6~4}uYU~2MZSJZ%q_{mt8uBJzL2>d$$5)}JxKb7n0Inqwkg@A zYUu%?ef&>G=P;&PM)TU*I)Vz7q5I7>b=wF9d0%#I0b#!R#usJ+)x{G%t%rk5Uo5|- zP$6$`2+kNU&_RJP&f8Aq*g(FLD!t#6E9N-&P4bVgm_PHDCLR$=hN(d!4|kq8q4J8*P|0#?w2xVm zQTb@``~r6LqNHJ2@ew>hX5bVoPCwxDx(pie^y?41y=y0fuH$d4aWp@+Qc!|yEQ+E@!k{@BXA`Kf;)0=bKNL zv>*LQu)b%jU%^-N6~@N{Kp-+EUbS^9-8KCV_mYV4$=@Qz&ucoocZ;S4{T(o<5FS~kWvZh8+qL0PpGSQ{=bOzbbErL9r1d|WUb8{j1=!#ktn@!o5GSToCs zw|`bq`AEm$?S~mYYQ&*OIN~$FiigD)@QcB($)Dm|1e|P^27)oVayv-#bvb@s zDD;0wY|p{-dc5*8UJC7gU0#ZyD$g`hx;!{ zkl$3HLiyx&*oIX>!B#-d}=9oL3u6MQS zJ3^+0C$G&MNeG_)1PIUs{-Tlm1)m)S9x3|yjg_@dnA%w$S?L}X4PlV9>FQ)o?fY&< zy)F(Y7-Pgtg)?xpB~i>sF}Ycb65r7zopq%<-KlOBjh5=<`pe|PP5H@40x3viI9Wa# zWls?*lSX9tHy}WQoRSFVC`fOlLja!z$IVG%W-)}hpy%N9PCWYydK}xXy-$r!pkNIt z`BYILDJdp$XUBOE$}ooJsFNmLG^&u##y_$%q4&*H>0stasN(kQ@AtjV`jHM+4 z2Pda>CBJoXz-o$gYG&HM^!ao+Zs+4`oCzG-IzUh45o5<%1Br=OOlS7p(SM=IFZRZn zR6z$gw6k+?a|=vM3yAdtrlyN&5_p#GNNbQdqmhE>s4*YWSmFQcLJFKj-<=c#$}v$> z6ha}5RX9?SYX92dCK8|9v%j1qC~)8t&`E?~z8m7H4jUZ{aJabR%In)_2zb&*BIkZp zUK8s0FkThKvbXuN;_6*8Ioiwng+dU)d+YrAjd@83`@j+(ypvud#UH?9PuIor;&p!cqpe}%3l9rsb(O2 z*LwlafgEkHgj%yd`wKI5!dVYRv9qmz4UEGmz7 zHa;#J0>+GS)-vYCV3+c?ZPNPBbVL*ov(8I(>UF>0@l8eLOtM;jjOuLq5~_O|C>X~b z(Gh|U7Z?5@T<@2C5+=?QpI`R=s*s1x&-aKHjFDGB?l`sf^Vqfi-TR<^gShSaDn@07 z`x&`5`z-j4U~rV_A59>hSm!)$y=H6EtYxK%wJqnE8IcvWbmvMfQO0q_|3w$f*#0ap zntCtKY?oW3ue!7*fCSLiuDtq}b831zr=pRthKEPhhM=gl7%A?h0~-&8l%)8rZ-a+> zN1g2##9iT$p|+$ZG6}C`Y!x@GH~I^?#|9+cI(0JU)-Ow5y@HF8>>Mquxm0ua%>K}1 zggWJ+^^lR|`_rdR+;^!yF0vyK3AORHBqe@r6F4Ao`hs-1S#xZ#@1j1vbVkQ&Rv$dV z_0M&mloMbqv2<0OUF>bW$CHDG9{ES26gLh#HVruc3;0{HI|?;;(zmIc7WVxicldsm_4+JEU!*iU<$ff1&;kNA|N1K_m+Pp zZ?{Fa>wo+CbjtUjq!K&Pw{HVV?u9$Dc2 z#hL>4Z>>GjM&L(YMyi5I{P+l7`%|p3gsJaT{mX}baW{3~fY+9MmHbbU4*oAY`M=uf z$vJrnD&?f}*;QWAFGevIbRQ4O`&dLDY$}C^HZJvlkzKSG;n zzQzMzpjH{#&PajdcSbILpl)v-XJ)XP7$G37r(xf3#BG=iN7}w*a;SU6QnOuO`FJK` zqa4~{GzX`FSc_0eB@#Lt``zi%nu8bv{|Aby)Ol9u_yBY{=fDM*47w*fx>jxpQ*g8c zN5yl9w;hC0rs`j0@^Y%W0FTDOp4`3f5kDdevCZY@Z*SX-Pto;R1c@N}HpCbqPDZ#{ zl!*^#JS{tG8My#(7M=W8cl4YnN1X8fHL(&InAG({iRf-GqPa@n)-KOX z$Dr=qUA7I`;kr-Ev#*5%$@7l|RuIZoYeMhKmzu1%5!$PAGoJx^Zz?nzvjrvfSG=}t z(?&Z;64XEj0ad?XJ^lK`aiyBO$`*#LVc=~B!9*e3GmkgRv*>9vEd_ORiZ@5d?7FUa zguh1JipCk$8ItZl&7!+y9;xEdt@~yoDt&o(?lNg&cGKCwFKOtFRq@sLCtH5;uCAHi zfn?*_%7JjT9Tf}9MRt=?13j&hI8+NElqM=Avove;nmqh47&QI~bYqq(?`atz+1!0PM05qWs> zeEW*x*Jn1V{EN=%!J<_*Xyb)d7fKN1_?my*Y-)+=h40s>Unum2x7x2Ly!P5IM%0CG z=I)PAPdV$A%+2XrA1`Rh=KQjy-*J#z%6Kac_zh3j)uRYc@ui0SKXWikf8542zRk3Ejfa6KvY+b<`Z4 z|L8ru8c%AZW9JBY-)F>;N;U+z)Sp_ifuDMla-KF$AH6BM{3}uE^MDceyJWas@mzs- z3QtoVtlH&Qjrw;OaiqgXf}~i4T=}kR^*X{dM5Mb!Lsr|aZ99rqivd^4{(%+FnamAI@!|Tx|3ccxBaCO8S4=a%S@dF zMp049$(Xi$H+?xdxr7Nz$v<4go*+N$A|ty-Ro!vyPW@I?UhcAK{rW|Sv>!$YoPq5! z>Dv~s^>Nr}EG_EiBxK{nccT%;gtwEVg*yob2Hgx znCZLNo2^MSX>>hU$OFq!nOqm;--+h5IUof`iV!ax5|Z$#srQkWKfC|38Mc=3fw0uX zw}o>544rUWB(@;S{-U{kBmhiXEO+^251Woe5s{F1ih1E^AYWcD9(GqV?X`1tw;nLGg;#KQ!pA=#tkV1pq}OwEZp z1+jKwZBY}mORCF|4x??^Pgu{MJtLIWtjJ;aKqRIclnr1A1D(T|rZ6sY@d-CcY>;*-KAzDya;mjQx*O9%^`WY-%N4u4>6f*`GEo zC<(vNAGcbccar2v&ybMhb*^UO&*>w9>5b=MC*v`#qWP&rQsS5>U1LuDu3DsFZJZ7{melvD399~AqZcxT||EDK1nZr0hVXrD? z3?l^p=1(NM!^ZFDfqOfu%8g6DkN1F|?P6`p6o+$Ejm@m1&1?mIMcF8rwmQ&GAx7C& zZ64}7^E&`7v|elSyU&L*#SFD9nHq7OZZBQ59ycfd3BAQ*>f0nLgsw6E?K@|xL1$)Idkph$FGO?zn>Qz!NU@bl4wpyXfF!|ZZU{4 z3SZC8GaA9)x&+O*t@Fi19LT;K&m>qmUh#+Bzje&5<|mq%bz2uW-LixUQ-!YxsYCVl zE&UQY$qJ)u({v_hGYJk=@16AC=T3i`_66OH^2oE$)qT@XLH>{PEJUeEFxKo z+xRb~+uKcxT;2sFB_!%W6gu3WubQi}jP2t3Cv-dwfH8!`QJzQf82F;y6*WiBSHLL;@dmJ=nAp(X})^*lbrE2>wl50qV!0S;BBEVV*zJ2 zw&2U~)`7R%c`pdw8UClf@LXg>!>>~5zqWM5echPC-3!_X0Fu}ZXJCapAky^xGleb0 z^3NCC>?06fTAX|s7#MUYJpTzLX>F}lN~(hZ`V*ear-w&j2G9Nx5c)@*6`>?^1aPFc zo#zk%5HsRO9!CCW*OxzZ#l%mN-l?h@owT9<$IKVW%2CFWg>)0(UP^v^vb4|Oj2jZ~ zG+b(cPxdBd(vyXc8ey=xMkjVu)M=r{>Yl%5Jk`#Y21;GGN9F7LGiWRid~tsw|H(&n z!uJ!qK)jC#GBDO+g93RHK0jo^A$&>S~F1yJ)KaI&?N87WajkSkLMQHbBkHPMqB#+W(umuS^^L z^=h12vcS=YJi~X!Jt~HDFSvh=|MH4O0h&G3*Ae}|?_^GS5{yJ(Vte8E-zh9t{v>Q9yIJFVMb;HQ|t8~biD@0o>e4g zCNllQwnrbJz1DV7F@jjIccI3n0R%d{f791ycdtN=jsU{z;jOz0t}dFX(6>2HX_x&b zuh{1J?Eiy#*YHDYe+Lq%KMLojwK~nlm;#EsjIX}QwScWw^n#h~KRMKk4*EhKGV-8i zr$@VOZ5gLWiv0QN;YnMp?mBW`)~!@kapdLYU%mSM$`ECL?4iicVweP43gTSn?P8rh z***OKJ3-EQ1GYz2?3jXhLW|pp2eNTnJG`Fn8AO}&I*w=t@H3F0W-DYu7Vyj z4q~=Q$&hYK4r10w$-abOS~jR#r3WZlj=xYVojz3&y>E^2d0328dG*(^VIgH}iXizH zP4G1$5=y36>g2%Mrqj0jubHYQs{Js!;b}x|3L|t&&{JQOS@IirctpHoQ?9t&Kalj&g^#x!Jqp)*De;fhp&=K$73gEoU{x`UYDPUCU|WZ z{IFfSc?RXaOvBY0C9>#CjyzoHep;x8({(#^ssB7z;``y7e`yKE`TlQN;g2;7<_auR zclBq5swekq@4bBqmTulr-y@kG9+F|**joRsvmAA8K0PHE(e^D-@5J~KEHR7>v_9~X zr19Fe$LHISTLjeZX2Nc=bk!%UU(jdtRxI}&cOSnAyC22o86O{K^BC43(g%R05A-HS zC8A3!A0Yge1io-q(r3=q7AIDN!>CF3vbFEy=>XpcqR=93j8HkW~$8ohWz*dj>0di4(`CVa(DjQ z0v%!30pH2QD4MhRD$6FN^#TC}F+stFy>b`yhP=GV`jX#S14^eBIV{?ZA#(Z~4i1Cw z4=Y~b+R}y?gQL4P7os>$8AUl z(IbAieV__`pc(7001+vQQ~&@Q;xUlGlkTE1Dtk%KSxy#Uy55L>3V!aNCIH%+9{EqL z2{@!U^DT5wfYEJTX#_UG;u0%9chU7JCQ(kge6`@b?FSAA;MYt>G?pui&GXbt=CAVR z3EPxaW;>+u?$-);F4M8Z(H+;bWx-m%oL~RsK7H=yGG4wVRB!%@&+Y2vpZmXD)WGq* znuzQV_R41AU?FGWlrhwBi(#Fx^F0CZGngcJXBb5{!!z~#zdiE9`%{GhO9vX1C6^aDFZX0nb~ z&32kHX;M$GFpHzJg(S|AJIzd_u(G)IEZ$%F z7WqD$A!y;&4@gE^-b4tkx#nWYjEwePOL-<$Jn5{Gnul1VTD4Khv@eV6K(XNh9rr$q2k6cu{Ml#B(G>E7cp z9vZv8^9wV;PN=IIQ~+Pa}>qx$bgxgM3`HVjiDjr zb^^ye62*~0)q}Bi=jgym6W_ueg(^OQlV%T*y-;yw0AZa9Q>F1{2{uO&S)sXL^$08X z9P*&%QG7GMB3;WysT&-yt=IZT!_X!h@~kQ7g11rMb<-TcRLPvn8N~Pzjz^Xx4!b;z zpo88Axs)3I0gQI1g7Y3tV@+ntg5{Lj!uN*;`J2TEZ5Qim6f(e^7893(V)*4Zc}_6c zoUR69{}~l~lyWF+J-%RjG}I0rMbK{yG9K2gga;%7Zv-myBSN~%S0XJj;fyj%LO&0# z*X-){jIYjQcnuUNkwuY`my>-JL~G7^MOO_q1X+>ER6iUF=4D*>UH1(hUrutsE<&$v zTCw(n!8tY1+PJowSWIs7%r0PTJ2G|jSN3>mfwI2bpY=K?;7h6xKH%W)%krK0hJ0nE z@wv^6FO#-H7UjKh%oHCIPa8N*SkG)GD@GAoS2j+ZETT6}+>WI84_iR)C#zu~06PEB zW}>=m3ROGV_iK8CtKWm~>Yp=fqzH%5GnlY}Bu;0uP<`XAiI2&z)8DwH`=;kLCOxmp zw0_ES4Em3cu8S{eIHT@Gv+ix74&uIk-FXTgz=-mp6!nKY_BkbSU;4}FX%bDX6g5|m z$Y~7Idf|PRtKq4tjP`IT%WX}xL{|8%y}@vlTGU5~2sBHhv(==@xzd|q6}_!G+sP*E zRb_eaG*?IgeDdW;Nd75oc-owYltqUF^URPu1T?j_h#kej>DfM$PtGC!ZyVRjD{dJO zW;6_iUtba@`(Xt>$L(-?uUUNhV%SU0DsRlwTf#%B$Y87ww8VLVtm{!xO;i}ljLxoP zC7g0bV;p5c2`B-WWe|&fhSRCR><+wgkp)Zp$y_$)+`y#I^$B*) z`&T=3&H=b~+G3+w#>tXeqYi7mIpg1|hGJd0EA6AKrvB(s(Z?&L@ygB6F15%ag0T;0 z_XGA(EYIEp53-IuDzM%c)d!1S3=)(PZ&KzEI^*q7obs zBz-xaRy;ICApGD=l`h;{*MET$(auGKiKK=1*T4835#CYuBjOGpv3OVDa${z>01*V% znkyM}VSYHr*M447Nmn~ z$K-?IARUMY<@RU`(4$bQM+M5}N+Ho3ch;HK8(b2BI~u#c$D#F9K6impcpKZTq zdEaE?rng?%-5jj&ApUIPRj}{@>>a9G6M2iuq4nize=j>?_<`mVwQFdQSnt~XPyVYt z65uWq5m>9!X>oi_^`#o&H+~)JEpz`Ebb$H3wfIr}Ce2q)@degVY|ntHAu0v?-mAUp z#4R6@K+w(5Bw$Zhc>ir9`yH`8hOE>3oEq$`5*F-}i~ICW!_27c1cvo3JfkA2>y5mD zx%*eD*JnZ+U@@+B*S#xx0oD6265xX08(*#CbAFKoH0x6}gty57(ax;XDk`jYS|k%$ z>=v8V#CF5FX<>8TOjC$~j_Q7yH`QMwi=&5r6Dn>qvXPPA*Na>z(H!olgA4`CFC_wN zA{FRD#k#GR7IC$QDPpkFcwC(c+`yo}LxyV}w*n$tc>TELL)pvtmAjc7n*ePO1VG%z z9riOfw;l`~aUeXb1)Zi&GxSrnkuNue%$dKZA=P#RfddSEU~Whh6{+stgu|Gi{AbTT zf$ShN;akKN)aUsJ3QD-FWvjfwuLFYeY@ku0y?Jr`@s%{SyTX4#?K!3M4m|4=j^OyaP@d%xDuoK?T)6EKcIZ$7{`nT#d? z5$e15M-Dsl4gM*=)Cf`YtMBV(An@-V+{!48EtvY=jBe!VN?|I05RQ66$NM@%Tf9xi z5F}Q>Ft*nGzFDTc>xra}s|ce5gmq|>iBK@TM&D2|T+Gj;I?!>F@W2ENEkVRxlahdM z47!j31J@HFR|26aT~YAmzU&?ix;>H3eUk%KLRpI^F1F_-l?R-vQE zvyAB0lJ|bGms`i9vJZDL`lHgH0(OdfP!l-1^I3O$&BlJR3 z-s$C)*reIxu$RkZ&9bq#{WUg8ETV1fj}7TV$YRNulA($~+G@oA6--6Yz>0<*;eYaa>pdWtfa{$6QKiF0(}Z3F~ScO@{w{3oX^QXz zWlVA8&I1!nABaUg`9oqUW2*PP{}w)A1Jx5Z2X+g2=4Eq(IpSxktY^{ctYd5{ZY8A>D#;+>-PUw~}U^FZ?3lGe+RB70dr9RBYb$!Xm zcp1(H1`a2;Oj>}$T8n)j`p95KAgA=BxE5nJP33)elR1@uLeql??Fy@na9q&+s4<(L znWdFbfI*-8mu+Ev1o~RS4C7a$PshhH!kPR`IcLL&R zVaA{a&;^dbw>EOwBOUs9P82I#65y4ufE^J&IoL*#bVh-hm67>5O?I44rZ2lE&a^ZU z$U;NEjL9vvxZq!1`2s|v_t?Jaw}cAK>o8qYc)Z;%UjwQRPBigH>E z5lcy*!1*{ja$-@5e)K+m=V=e9^ef@P}R@~ z3edGiIlkgsMBFdNMpqoeg2_CB{V%+ab(iY`CQod5G$ukq!@wg~fb2=!F;IPxcLPJpvY9=s_Yt9} zd3a!Y#fH>u{27tyC%EK|>KXAP7Rz`kTccldb4Ri$L=e>cL#nH}-4V~F-QAxD1bQGq zU^|6R6}mEmmeiooP&!stOw-<|j(mkA2k-|S+8^vMuc#9G5%!YSd`qD{$!{>HOP|g+ z{JX{y3RNn64PkwQ}h(XPMht=SHS%wlD`0u*E# z_Zb)q$Lx_6U`>V4q$o3!z{R&Wg;C>jCui+-mk-7hcMY%3W$JfQz~WG8m1kCe;!v#2obAdm-;&tnrjx9FJV1K>1d z{9MP}TpyGk;J`!_p290zLCaoPNWSSrC;!h@a?Jh;u9$Zsd~6yK?#V1NE*V*5ATl;u z+e!WBbvbu;{?4whpWy1-rYSgvgTbz>fezwdSMSQyJ>Y?m{d)rO=kb>t9V#E+Ae5nP zqajYU)vfXCAo08GO28i{_>tv;Oy4hLpbeW+;KcyZ!6(SOvBoxv#~AzSLw{t->QdAR zrY}BNm&kTR-*W!C`g2HcIH`#E>uL+QpB8s)JNf1*$!Hm<2Bj~&2NNUKp-G)emgZc( zg2Sy2$-Y0Z3+FUi@$d^)852mZ$5p)tZoNIJy-Sca2rL^Ab;eyX9(n1OIn=PBR1PBbnqb6wV=v+($u_SG8JYg z`Q}z#r^*C_FW~%Ssv3lJp#)QR6Ti+bDz47XT*6Q%uACEVkJ^OjhbCku&q=cB8RUj} z&qh9&87zl&E(U9zE^NvyX2{8jdw{hyql@1?5}xwE1ptmxxOO-gVI90exxKvCQR`#r zqb&@@S|PE52H*fyDnMM$>ILZ5y)zd!(u+c&{Y4zz51v@TL0K_YSziWDOuk-7e^fx- zI|Vo_vl4yggxbLBj*fSkjP&Zc%`4|4Tw~|Li^pU*Kxb#j6Qh$jVT*-Hwg&*~!#hLdJ!to9Nna*4vAl)_$iG(nHyXR3&^8hzMM_+1># z+^Q!qN!EgPOmT1LX(E+W@3gN%5U>BxTvqhF5#h`Gm|{=RjB9Qy#;K3mf2 zj`!D>t-1UNnRtea92ANDi7Toa9U zFtvTx6=qQ9@b1Ih2ID^rdiQLtsos0)rwRFmBHfD9zrv_NKkd%&zUAXimK=}6ug{Wy zv)zK`yl{uKy2*bqwEx(lDJ#Zx>+AO%JK`0PW!I@SAu>TF`z3M?`xZD)aT^% z7&YCSRIk0=#SAq+({Vl1UC{|I`6Uecb64~bfw6#9_nDmF$#bM=cS_(GRE7Y|$DC~Y zp@noT7PrLK{H2lM9zL-bX!j3AsG?(~%n^e&Wug`IVS9H`G`yY154B>?H}}aV@E~5o z{%b{d_R9@Ppv3>?nj92+H7fO@KzVFyDu?}W1*u)u)6Ojdm;WQ8yz+gBavfTnPI7Tg zbW1VW9TDQv(3_1S++*0)mPVZzGmz!=!cZ;!yG|5cT)UH|KbTQ0FgXf>`j5CI9U_o^ zdw~J00fNySN`a}CIckZTK5t1Oe>APQsyqthdZ_-$&)BlrfHel+to>qD0%(C=xF%?IKqr^SS#@ojq9`={%J-I-@C>1`|{ zo|I+&MA9tg+8}Zf{TcMz10gp;QsFl}1qJ|srTFxJ0aD@jG}^jT@So|}cmswvj~i?3 zKTV!N7b6~ChUYqX{rLzx_gE3}szm@Q3}DXzRXtD_Fn2m>YQ_d|R%kHR4us(C&?}Tevk(lp&j#4&e#|WzF-gud1-d%@R>#Z6-$-+gNx!hkrXnC_d1DIO*yYpxH zf>d+IIosH;iw5F-oHpYxHot4WHfEW47nwvhf&7DhZ&;+V7a^u)cMn&`%U7Eml!iGmzrj&@ANG{4dOdxxKA$>VVGr4gwW-cp)pfhqBV^M~sjfIXpNl+qRKyuBgjiH5k||VXb9}qdAF;Q0BeS zB6=l14>U%!uprsD-K9dTfW4(v35nnQ#PX?pczSlgqa2P%UaVsOfBHD{cqq3&jz41? zWY?9QD2XmJA#0H(-NK}@Z)0gA%P1ntSR!3iN};k{TV)%SNXdvnvI}J!!dMDJqh`h| zzw_MJ{rmUV^WQvk&g-1>{d_;~&v`iG{e4(BckR+Drm(MdrjzvI-Fy|2@d6Jj(xKPw zlc(o0)1Uckuz~3|vp?NjJ*L6_n!99I7E|whk9wt+7W}@4W%VCEJyNWi9iNem`quK) zvZg|DVd2^<%DH+&xWerS*UKyz#&i4`R0}5R0ap|mY05GQEBk(Dc>+V$;x#*jle{%B z$x9sL4>tZPcAK>;tdvu!&7fX)xNdThPygp^qATO;QOybr3Gc}Nph+-UStS{G9b$4t zTmNA{P3{nR#(3mLgaCAT`r^cIKL<`|XB9sb3pj&S4Z@{~llwky>(7HkIXy~NpHrY` zP6Mv{OF-WMnc=9&SfyRc&LOvoM57ASSg{gv?MQA`G`1~qY7!96E>K4OIO%QFb&T|& z;fJx1#bdqe6DoZ$&2OK4H?j2O?1~zl{t8^SLVjC#Gkn=(*BOROiii!d)R35OzW0Z} zuKHCHJXRO-W!};(3rc-@SmA^MLFH}rV_rO8Gd9~2uqz8huq zWkqw~EIfQt*X;&^`Gzo$Ml&MR#~iX)(Cyr7c+}+`m<;w-Zy;ZE#Da;`Xtjdy=H|@Y zu$Y00SI2wF(D0WH)#1na8}(?<%IP3~OPX^${%a<^`CqYOZafUjgTMSI!ARx3)8i|@OET0Q$yWCi!-r23=KSe!5w_E zf8MUk`z>4A$O_+)5xoaxB&*LH44#xV3{jM$(Pgd8HxBq+3zk`7Q`X)eoz9;|N=mi@ zq=10_QvYzFD%jX9 zs6cRM0u5a1lc`P%o!pEX((ucr8XwYWEjK>lxdArD?P0^f1V7x=aiXNrN&HB=@r}_E zxr3r6UTRP*L0!zpi<$uX%>>X`s+&$rz4my8mA6ceBgAg$05j{{)*GKw4uXv(RF^qHutxKNo!m3UjCAm*FpeQw#T+7FfFyv!jU_#cht5q@(8mwMYgAr0>{f zD?HQJ$F$JEy|ncKDFogkuh{z3H7_d&>MndQGjsx2T4_tl0=?ohT=dl9ua1al1;xjW zT>)9GldLlr=Q;s`?RvDOa*zL{cRSFBgALbQXsc6y0MSK=B`N;P;;!hY8nm}%XUWI1=#WB^FrFO1R8E1 z6qR{4cdyRg4%!7UDFt~bq(xi%(&>o9c`xXCFEn%!vp(@1_D41Z&=vP00Dcbucw3;v z3|CoQPs08Sj>2)ZgLdbDs`z4uXd-w?S4Q^;v-;qo>{t>Ni&lMSxll*Y&pHSKuVInW-D7_rk! zw(mTCWf_c@)07eon6x9jMNVwmR>Md7$xz+o?L!AG#^(xOcr9cm7t})#uKDgAjOlLs zjJ*-|OjMZ)*m&Rk8W0e?mw;5*b524r`kO$~+PWar)elG4eNgNISLaczxW%oF4z!?^t8!5__2 z9C{g~3pe@hm*|Z+s*9|vl+}Ch3X11~^OL$IYT@Q4DI8L^n@A=HO5Z)L;+$J_gXzo` z${ngWEPV0s1|>7dXye9OU0vOmI{%wfYxpT;QJPu%&iMu3ZCj*-WNQVUpx%ewx<85) z{MMQ8eB>aH0yl;SBf6B*vm&9Xe8J*ANisko^afF3H9{6)t=>%G&}B^M+I190kkqzwz@g z)x1r?<#_h?Z$nNA-xe?NT9rsG=EXdvzgv6EqbClg7JvUy`BX^iq&+q1c}9l(R|V;c z=A@;41*E50ynxsGKV&RZj&^y(dDj!r+^gY{Cc5YphyMMtyAu|)DOk{{TaWQov)LCM z9;btkaLj>j^)qw39^Gjzq;z<;Mpr>!M|;2Rbcq%gJJt@FEl z?Np$%&&`T;pPYDr1j(3pCf1qaIi4iqvJ*Y*qZ8j0S@Qlq3`GM|(38hRr@r>F{Z+Hl zh9Ew?ziL-dsFUY1Ty%OtXv#-S2{ZZ}AN3#cK?Tl3U_ZKkzFHV>p8`0j5KKSwg5#S8 z-mQ9#+>|!A2npgmV?==M(oH&B+=qGB+cct!gVn1NV{IRhr9rf)ha3)c_g=Udbn2{U z2872a)ZTe1e2Z3nOf9am63SRM=d{m3M5L9R993{B9oT(*NTj-vku1iXtzV8QybYUx zR~GxS;AeODiSV^aW8X_b92I3F!eBHjlBpkW8YiD8Cnvb$yVeg|?g5eFa|v2*K@hQr z%R&Y<9)eXvfP~8Y{nX?D@3(22o2Krmxp~n_{L#^_%yAhI)KmgzUt5d0eLGk$H>6P& zdp|42p(`Hv2(4dOf1kRPV?f{jAaC7L)mm5kHvw3WmUuybpCme3K1lglG<>WAc7_A2 z0*0`lj`)H#EAd!0SOVk}+Ad3*fs-vG?N%#5tb9K`n#1dyC`j49ifRTj0Y>g#Z;z0w zs}xH;?dmBKhu9pO6gMaVl1I4tLQ>y7GTNCkTtsdOH=5-QtCPiz7{-m0xU|en(#l9B zI-V8P-qGR5qHh!>b^>?A7}(M^crNF|kPI8tuP0_35hXtbMZ{#D&n=l06(1Rp$XtOM znyJD<>VdO*aif1EI5!B6pRkHvnr(Hr(MRvg9)lNDRfuXijW;@c|Lnapc;Y^Rv_m8_&tt{2+V3dmyEDey6;zURY3r(+r%D y_M+}&q-@Pkf7BBp_)^F03&JJz|Gy)>$vxS2G+Vn;^&<$GLx0&gSl3u$ll})yyCuy4 literal 20436 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 H`(OGe3Gn)4 From d8773879c65349ad8c06e6c43d3bbbf45c764d65 Mon Sep 17 00:00:00 2001 From: Selis Date: Fri, 16 Jun 2023 18:20:56 +0200 Subject: [PATCH 34/37] Adds tracy integration --- code/game/world.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/game/world.dm b/code/game/world.dm index b204bc94fa..3e8e7eaf7b 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -1,5 +1,17 @@ #define RECOMMENDED_VERSION 513 +/proc/prof_init() + var/lib + + switch(world.system_type) + if(MS_WINDOWS) lib = "prof.dll" + if(UNIX) lib = "libprof.so" + else CRASH("unsupported platform") + + var/init = call(lib, "init")() + if("0" != init) CRASH("[lib] init error: [init]") + /world/New() + //prof_init() // CHOMPedit - Uncomment to enable Tracy. Requires https://github.com/mafemergency/byond-tracy/ world_startup_time = world.timeofday rollover_safety_date = world.realtime - world.timeofday // 00:00 today (ish, since floating point error with world.realtime) of today to_world_log("Map Loading Complete") From 014e85121841dd3dc75c5167ca1db76c0c7f0e2a Mon Sep 17 00:00:00 2001 From: Selis Date: Fri, 16 Jun 2023 18:24:54 +0200 Subject: [PATCH 35/37] CHOMPedit Comment --- code/game/world.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/world.dm b/code/game/world.dm index 3e8e7eaf7b..c61c58ec9e 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -1,4 +1,6 @@ #define RECOMMENDED_VERSION 513 + +// CHOMPedit Start - Tracy /proc/prof_init() var/lib @@ -9,6 +11,7 @@ var/init = call(lib, "init")() if("0" != init) CRASH("[lib] init error: [init]") +// CHOMPedit End /world/New() //prof_init() // CHOMPedit - Uncomment to enable Tracy. Requires https://github.com/mafemergency/byond-tracy/ From 338fb4127dc1138632afed4e7a4cc2ff6d68e506 Mon Sep 17 00:00:00 2001 From: Selis Date: Fri, 16 Jun 2023 19:01:30 +0200 Subject: [PATCH 36/37] adds vr areas --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index c6b9a1880c..bdf2b46375 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4516,6 +4516,7 @@ #include "maps\southern_cross\structures\closets\misc.dm" #include "maps\southern_cross\structures\closets\research.dm" #include "maps\southern_cross\structures\closets\security.dm" +#include "maps\southern_cross\submaps\virtual_reality\constructVR.dm" #include "maps\southern_cross\turfs\outdoors.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" From 2a6d65a6d4e571da27bf883201ea470692d58cb5 Mon Sep 17 00:00:00 2001 From: Selis Date: Fri, 16 Jun 2023 19:39:48 +0200 Subject: [PATCH 37/37] Comments out include --- maps/southern_cross/submaps/_southern_cross_submaps.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/southern_cross/submaps/_southern_cross_submaps.dm b/maps/southern_cross/submaps/_southern_cross_submaps.dm index 50757bd593..d445785528 100644 --- a/maps/southern_cross/submaps/_southern_cross_submaps.dm +++ b/maps/southern_cross/submaps/_southern_cross_submaps.dm @@ -50,7 +50,7 @@ associated_map_datum = /datum/map_z_level/sc_lateload/gateway_destination //VR maps go here, tell me if theres a better way to load this -#include "virtual_reality/constructVR.dm" +// #include "virtual_reality/constructVR.dm" Virtual Reality areas included by default. /datum/map_template/sc_lateload/vr_world name = "VR World" desc = "A dynamic, virtual world."