From dad40bdfeed76e70970f5f55d63b4e3ac31061c2 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 17 Aug 2022 00:57:31 +0000 Subject: [PATCH 01/20] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15780.yml | 27 ------------------ html/changelogs/AutoChangeLog-pr-15787.yml | 4 --- html/changelogs/archive/2022-08.yml | 32 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 31 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15780.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15787.yml diff --git a/html/changelogs/AutoChangeLog-pr-15780.yml b/html/changelogs/AutoChangeLog-pr-15780.yml deleted file mode 100644 index 48b3a2d7b0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15780.yml +++ /dev/null @@ -1,27 +0,0 @@ -author: "TripleShades" -delete-after: True -changes: - - rscadd: "[Omega] Cleanbot named \"Rustbucket\" to the Bridge" - - rscadd: "[Omega] Securitron \"Pingsky\" to AI Sat" - - rscadd: "[Omega] External AI Sat cams around the south" - - rscadd: "[Omega] Unfinished cleanbot to Robotics" - - rscadd: "[Omega] More status displays and AI displays" - - rscadd: "[Omega] Captain's Wardrobe vendor" - - rscadd: "[Omega] Engineering Supermatter Room now has a YouTool" - - rscadd: "[Omega] Hydroponics front desk now has windoors" - - rscadd: "[Omega] Bar monkey Punpun placed at the Bar" - - rscadd: "[Omega] Paramedical room" - - rscadd: "[Omega] Scrubbers to Xenobiology slime pens" - - rscadd: "[Omega] Xenobiology now has one canister of BZ" - - rscdel: "[Omega] Tiny Medbay reception desk" - - rscdel: "[Omega] Overlapping cams and window-sitting cams" - - rscdel: "[Omega] Defibrillator outside of Medbay Surgery" - - rscdel: "[Omega] Rogue isolated power wire under East Maintenence Airlock" - - tweak: "[Omega] Virology now has a cycling airlock" - - tweak: "[Omega] Xenobiology slime pen floors and kill room floor now match other stations" - - tweak: "[Omega] Xenobiology main scrubber and vent shifted around" - - tweak: "[Omega] Medbay intercoms are now largely on the unique frequency other stations use" - - tweak: "[Omega] Certain floors under airlocks now properly match their surroundings" - - tweak: "[Omega] Atmospherics now has layer adaptors" - - tweak: "[Omega] Cargo's starting crates are shifted around to better show which belt goes to the shuttle" - - tweak: "[Omega] Engineering Secure Storage button is now in Chief Engineer's office" diff --git a/html/changelogs/AutoChangeLog-pr-15787.yml b/html/changelogs/AutoChangeLog-pr-15787.yml deleted file mode 100644 index 7ae2fc5770..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15787.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "added a missing signal call to SSticker" diff --git a/html/changelogs/archive/2022-08.yml b/html/changelogs/archive/2022-08.yml index 95abd8d628..9520148db0 100644 --- a/html/changelogs/archive/2022-08.yml +++ b/html/changelogs/archive/2022-08.yml @@ -55,3 +55,35 @@ the round' - refactor: Announcement audio is now stored in a datum to make it easy to add different announcers +2022-08-17: + Putnam3145: + - bugfix: added a missing signal call to SSticker + TripleShades: + - rscadd: '[Omega] Cleanbot named "Rustbucket" to the Bridge' + - rscadd: '[Omega] Securitron "Pingsky" to AI Sat' + - rscadd: '[Omega] External AI Sat cams around the south' + - rscadd: '[Omega] Unfinished cleanbot to Robotics' + - rscadd: '[Omega] More status displays and AI displays' + - rscadd: '[Omega] Captain''s Wardrobe vendor' + - rscadd: '[Omega] Engineering Supermatter Room now has a YouTool' + - rscadd: '[Omega] Hydroponics front desk now has windoors' + - rscadd: '[Omega] Bar monkey Punpun placed at the Bar' + - rscadd: '[Omega] Paramedical room' + - rscadd: '[Omega] Scrubbers to Xenobiology slime pens' + - rscadd: '[Omega] Xenobiology now has one canister of BZ' + - rscdel: '[Omega] Tiny Medbay reception desk' + - rscdel: '[Omega] Overlapping cams and window-sitting cams' + - rscdel: '[Omega] Defibrillator outside of Medbay Surgery' + - rscdel: '[Omega] Rogue isolated power wire under East Maintenence Airlock' + - tweak: '[Omega] Virology now has a cycling airlock' + - tweak: '[Omega] Xenobiology slime pen floors and kill room floor now match other + stations' + - tweak: '[Omega] Xenobiology main scrubber and vent shifted around' + - tweak: '[Omega] Medbay intercoms are now largely on the unique frequency other + stations use' + - tweak: '[Omega] Certain floors under airlocks now properly match their surroundings' + - tweak: '[Omega] Atmospherics now has layer adaptors' + - tweak: '[Omega] Cargo''s starting crates are shifted around to better show which + belt goes to the shuttle' + - tweak: '[Omega] Engineering Secure Storage button is now in Chief Engineer''s + office' From 0c12f3f11178b6d8aab86f861901f296a69c63af Mon Sep 17 00:00:00 2001 From: Cognition Date: Tue, 16 Aug 2022 19:49:16 -0600 Subject: [PATCH 02/20] Removes persistence from glowing goo --- code/game/objects/effects/decals/cleanable/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 28999ef0b5..cc9fc8c2b3 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -126,7 +126,7 @@ icon_state = "greenglow" beauty = -300 mergeable_decal = TRUE - persistent = TRUE + persistent = FALSE /obj/effect/decal/cleanable/greenglow/Initialize(mapload) . = ..() From e51b0da44bdc6c6cfcf54a7bdebefc208ef4dd64 Mon Sep 17 00:00:00 2001 From: TripleShades Date: Tue, 16 Aug 2022 23:00:41 -0400 Subject: [PATCH 03/20] pain --- _maps/map_files/OmegaStation/OmegaStation.dmm | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 31588eea8d..406c309aa9 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -25228,14 +25228,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/airlock/virology{ - name = "Virology Access"; - req_access_txt = "39" - }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/virology{ + autoclose = 0; + frequency = 1449; + id_tag = "virology_airlock_interior"; + name = "Virology Interior Airlock"; + req_access_txt = "39" + }, /turf/open/floor/plasteel, /area/medical/virology) "aUL" = ( @@ -26273,14 +26276,17 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/virology{ - name = "Virology Access"; - req_access_txt = "39" - }, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/door/airlock/virology{ + autoclose = 0; + frequency = 1449; + id_tag = "virology_airlock_exterior"; + name = "Virology Exterior Airlock"; + req_access_txt = "39" + }, /turf/open/floor/plasteel/white, /area/medical/virology) "aWN" = ( @@ -37545,13 +37551,6 @@ }, /turf/open/floor/plasteel/dark/corner, /area/maintenance/disposal/incinerator) -"nWW" = ( -/obj/item/radio/intercom{ - name = "Station Intercom"; - pixel_y = 26 - }, -/turf/closed/wall, -/area/medical/medbay/zone3) "nXb" = ( /obj/machinery/pool/drain, /turf/open/pool, @@ -80681,7 +80680,7 @@ bxT aYL aZH bay -nWW +aSh aUn aWb bdT From d5b23752a157c5480e795a339f6013ac9210013d Mon Sep 17 00:00:00 2001 From: TripleShades Date: Tue, 16 Aug 2022 23:07:03 -0400 Subject: [PATCH 04/20] wait while I'm here --- _maps/map_files/OmegaStation/OmegaStation.dmm | 1 + 1 file changed, 1 insertion(+) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 406c309aa9..e681688066 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -35865,6 +35865,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark/corner{ dir = 1 }, From a600ea86b9de57c88c9715d6235dfad34ea1ab6f Mon Sep 17 00:00:00 2001 From: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com> Date: Wed, 17 Aug 2022 00:59:07 -0400 Subject: [PATCH 05/20] midround pr get trolled --- code/modules/surgery/tools.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 4161ed1f70..229167f340 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -105,6 +105,7 @@ attack_verb = list("burnt") tool_behaviour = TOOL_CAUTERY toolspeed = 1 + heat = 3500 /obj/item/cautery/attack(mob/living/L, mob/user) if(user.a_intent == INTENT_HELP) @@ -159,6 +160,7 @@ icon = 'icons/obj/surgery.dmi' icon_state = "surgicaldrill_a" hitsound = 'sound/items/welder.ogg' + heat = 3500 /obj/item/surgicaldrill/advanced/Initialize(mapload) . = ..() @@ -234,6 +236,7 @@ toolspeed = 0.7 light_color = LIGHT_COLOR_GREEN sharpness = SHARP_POINTY + heat = 3500 /obj/item/scalpel/advanced/Initialize(mapload) . = ..() From 228c637d76c27bce1299db4cac9a8e35ed1f2dfe Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 17 Aug 2022 19:19:50 -0700 Subject: [PATCH 06/20] Probably fixes bad stake behavior --- .../antagonists/bloodsucker/items/bloodsucker_stake.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm b/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm index 69410027a4..5e6989806a 100644 --- a/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm +++ b/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm @@ -66,6 +66,7 @@ /obj/item/stake/afterattack(atom/target, mob/user, proximity) //to_chat(world, "DEBUG: Staking ") // Invalid Target, or not targetting chest with HARM intent? + . = ..() if(!iscarbon(target) || check_zone(user.zone_selected) != "chest" || user.a_intent != INTENT_HARM) return var/mob/living/carbon/C = target @@ -139,9 +140,8 @@ // Convert back to Silver /obj/item/stake/hardened/silver/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weldingtool)) - var/obj/item/weldingtool/WT = I - if(WT.use(0))//remove_fuel(0, user)) + if(I.tool_behaviour == TOOL_WELDER) + if(I.use(0))//remove_fuel(0, user)) var/obj/item/stack/sheet/mineral/silver/newsheet = new (user.loc) for(var/obj/item/stack/sheet/mineral/silver/S in user.loc) if(S == newsheet) From 6340292604b6f22bdf77b1732e2337ccfc76dd7e Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 17 Aug 2022 22:56:02 -0700 Subject: [PATCH 07/20] Makes linux performance on startup better --- code/__DEFINES/_auxtools.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/_auxtools.dm b/code/__DEFINES/_auxtools.dm index ab07becbd9..fc5dfd4378 100644 --- a/code/__DEFINES/_auxtools.dm +++ b/code/__DEFINES/_auxtools.dm @@ -1,9 +1,12 @@ #define AUXMOS (world.system_type == MS_WINDOWS ? "auxmos.dll" : __detect_auxmos()) /proc/__detect_auxmos() - if (fexists("./libauxmos.so")) - return "./libauxmos.so" - else if (fexists("[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so")) - return "[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so" - else - CRASH("Could not find libauxmos.so") + var/static/known_auxmos_var + if(!known_auxmos_var) + if (fexists("./libauxmos.so")) + known_auxmos_var = "./libauxmos.so" + else if (fexists("[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so")) + known_auxmos_var = "[world.GetConfig("env", "HOME")]/.byond/bin/libauxmos.so" + else + CRASH("Could not find libauxmos.so") + return known_auxmos_var From a87cc0724d1f3112b7af485ad969d0603a870779 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 18 Aug 2022 02:28:11 -0500 Subject: [PATCH 08/20] Automatic changelog generation for PR #15793 [ci skip] --- html/changelogs/AutoChangeLog-pr-15793.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15793.yml diff --git a/html/changelogs/AutoChangeLog-pr-15793.yml b/html/changelogs/AutoChangeLog-pr-15793.yml new file mode 100644 index 0000000000..59d0d9e21f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15793.yml @@ -0,0 +1,6 @@ +author: "TripleShades" +delete-after: True +changes: + - rscadd: "[Omega] One decal to better indicate Turbine area" + - rscdel: "[Omega] Duplicate leftover intercom" + - bugfix: "[Omega] Virology Airlock access buttons should actually work" From 440aac93d6ab35e89bce5df9fc96752c0b8139a5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 18 Aug 2022 02:28:22 -0500 Subject: [PATCH 09/20] Automatic changelog generation for PR #15792 [ci skip] --- html/changelogs/AutoChangeLog-pr-15792.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15792.yml diff --git a/html/changelogs/AutoChangeLog-pr-15792.yml b/html/changelogs/AutoChangeLog-pr-15792.yml new file mode 100644 index 0000000000..1db8557703 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15792.yml @@ -0,0 +1,4 @@ +author: "BlueWildrose" +delete-after: True +changes: + - balance: "Removes persistence from the cleanable glowing goo. It'll no longer last between rounds." From 6847ef3db562dd256aae95382902c96e00231b64 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Thu, 18 Aug 2022 01:13:05 -0700 Subject: [PATCH 10/20] sandstorm nerf --- code/modules/events/dust.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index 3bece46dcd..c854f3b5a4 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -19,7 +19,7 @@ typepath = /datum/round_event/sandstorm weight = 5 max_occurrences = 1 - min_players = 5 + min_players = 10 earliest_start = 20 MINUTES /datum/round_event/sandstorm @@ -29,4 +29,4 @@ fakeable = FALSE /datum/round_event/sandstorm/tick() - spawn_meteors(10, GLOB.meteorsC) + spawn_meteors(rand(6,10), GLOB.meteorsC) From 81cbda5cdab65d6ff1d615f36c81ac88186221e7 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Thu, 18 Aug 2022 01:15:34 -0700 Subject: [PATCH 11/20] announcement too --- code/modules/events/dust.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index c854f3b5a4..39c04003a9 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -28,5 +28,8 @@ announceWhen = 0 fakeable = FALSE +/datum/round_event/sandstorm/announce(fake) + priority_announce("The station is passing through a heavy debris cloud. Watch out for breaches.", "Collision Alert") + /datum/round_event/sandstorm/tick() spawn_meteors(rand(6,10), GLOB.meteorsC) From a0d351bc223ddbddd6fa4abc150401fe9444a24d Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 19 Aug 2022 00:56:06 +0000 Subject: [PATCH 12/20] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15792.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15793.yml | 6 ------ html/changelogs/archive/2022-08.yml | 8 ++++++++ 3 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15792.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15793.yml diff --git a/html/changelogs/AutoChangeLog-pr-15792.yml b/html/changelogs/AutoChangeLog-pr-15792.yml deleted file mode 100644 index 1db8557703..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15792.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BlueWildrose" -delete-after: True -changes: - - balance: "Removes persistence from the cleanable glowing goo. It'll no longer last between rounds." diff --git a/html/changelogs/AutoChangeLog-pr-15793.yml b/html/changelogs/AutoChangeLog-pr-15793.yml deleted file mode 100644 index 59d0d9e21f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15793.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "TripleShades" -delete-after: True -changes: - - rscadd: "[Omega] One decal to better indicate Turbine area" - - rscdel: "[Omega] Duplicate leftover intercom" - - bugfix: "[Omega] Virology Airlock access buttons should actually work" diff --git a/html/changelogs/archive/2022-08.yml b/html/changelogs/archive/2022-08.yml index 9520148db0..d3fd633d2f 100644 --- a/html/changelogs/archive/2022-08.yml +++ b/html/changelogs/archive/2022-08.yml @@ -87,3 +87,11 @@ belt goes to the shuttle' - tweak: '[Omega] Engineering Secure Storage button is now in Chief Engineer''s office' +2022-08-19: + BlueWildrose: + - balance: Removes persistence from the cleanable glowing goo. It'll no longer last + between rounds. + TripleShades: + - rscadd: '[Omega] One decal to better indicate Turbine area' + - rscdel: '[Omega] Duplicate leftover intercom' + - bugfix: '[Omega] Virology Airlock access buttons should actually work' From 13875adb6283b51388e13cce7994bc5b82d9e887 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 19 Aug 2022 00:54:14 -0500 Subject: [PATCH 13/20] Automatic changelog generation for PR #15796 [ci skip] --- html/changelogs/AutoChangeLog-pr-15796.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15796.yml diff --git a/html/changelogs/AutoChangeLog-pr-15796.yml b/html/changelogs/AutoChangeLog-pr-15796.yml new file mode 100644 index 0000000000..32d3b0b790 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15796.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Caches the auxmos file if found" From e6e7f704f4f5007806c692b4404ec7a0de2d84ba Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 19 Aug 2022 00:54:25 -0500 Subject: [PATCH 14/20] Automatic changelog generation for PR #15795 [ci skip] --- html/changelogs/AutoChangeLog-pr-15795.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15795.yml diff --git a/html/changelogs/AutoChangeLog-pr-15795.yml b/html/changelogs/AutoChangeLog-pr-15795.yml new file mode 100644 index 0000000000..a7309183c3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15795.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Stake (maybe)" From 7e46dddb323e7e4bcca5454b766ccc9994c61da5 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 19 Aug 2022 00:55:04 -0500 Subject: [PATCH 15/20] Automatic changelog generation for PR #15794 [ci skip] --- html/changelogs/AutoChangeLog-pr-15794.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15794.yml diff --git a/html/changelogs/AutoChangeLog-pr-15794.yml b/html/changelogs/AutoChangeLog-pr-15794.yml new file mode 100644 index 0000000000..bf8eed830b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15794.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - tweak: "cauteries searing tools and energy scalpels now have heat and can be used to light cigarettes" From 23f2bd4aee70a1f3fb01b74dd2a8204b3229dabf Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 19 Aug 2022 16:12:30 -0500 Subject: [PATCH 16/20] Automatic changelog generation for PR #15797 [ci skip] --- html/changelogs/AutoChangeLog-pr-15797.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15797.yml diff --git a/html/changelogs/AutoChangeLog-pr-15797.yml b/html/changelogs/AutoChangeLog-pr-15797.yml new file mode 100644 index 0000000000..9baa4db7f0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15797.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Sandstorm now happens less often, tends to be less powerful and is announced." From bc0c9291043722715a6143fcff3393362dcd1a4d Mon Sep 17 00:00:00 2001 From: SpookyTheFox <67441715+SpookyTheFox@users.noreply.github.com> Date: Fri, 19 Aug 2022 15:39:17 -0700 Subject: [PATCH 17/20] added a magazine name hopefully fixes this, I don't like seeing null ref exceptions --- code/modules/projectiles/boxes_magazines/external/magweapon.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/boxes_magazines/external/magweapon.dm b/code/modules/projectiles/boxes_magazines/external/magweapon.dm index a1b7f58698..de8766819f 100644 --- a/code/modules/projectiles/boxes_magazines/external/magweapon.dm +++ b/code/modules/projectiles/boxes_magazines/external/magweapon.dm @@ -1,4 +1,5 @@ /obj/item/ammo_box/magazine/mmag + name = "magrifle magazine (non-lethal disabler)" icon_state = "mediummagmag" ammo_type = /obj/item/ammo_casing/caseless/magnetic/disabler caliber = "mag" From 244d7318e81c73f999a7ccc7cdee5e04c5258307 Mon Sep 17 00:00:00 2001 From: SPLURT Bot <97993072+SPLURT-Station-Bot@users.noreply.github.com> Date: Fri, 19 Aug 2022 23:27:49 +0000 Subject: [PATCH 18/20] Automatic changelog generation for PR #441 [ci skip] --- html/changelogs/AutoChangeLog-pr-441.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-441.yml diff --git a/html/changelogs/AutoChangeLog-pr-441.yml b/html/changelogs/AutoChangeLog-pr-441.yml new file mode 100644 index 0000000000..d7ebbc9482 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-441.yml @@ -0,0 +1,4 @@ +author: SpookyTheFox +delete-after: true +changes: + - bugfix: fixed non-lethal magrifle ammo magazine name From 7ada7c18ff4980cfae0afb8fd37ec92e06277827 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 19 Aug 2022 23:29:07 +0000 Subject: [PATCH 19/20] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-441.yml | 4 ---- html/changelogs/archive/2022-08.yml | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-441.yml diff --git a/html/changelogs/AutoChangeLog-pr-441.yml b/html/changelogs/AutoChangeLog-pr-441.yml deleted file mode 100644 index d7ebbc9482..0000000000 --- a/html/changelogs/AutoChangeLog-pr-441.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: SpookyTheFox -delete-after: true -changes: - - bugfix: fixed non-lethal magrifle ammo magazine name diff --git a/html/changelogs/archive/2022-08.yml b/html/changelogs/archive/2022-08.yml index 98ca0a95ba..81b2036ba8 100644 --- a/html/changelogs/archive/2022-08.yml +++ b/html/changelogs/archive/2022-08.yml @@ -137,3 +137,5 @@ - server: Adds the option to kick players who are likely connecting through a vpn on join - code_imp: reorganizes modular config code just a bit + SpookyTheFox: + - bugfix: fixed non-lethal magrifle ammo magazine name From 3336390eb283ce7e25ce5106fba7a1ddf9f61f73 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 20 Aug 2022 00:51:25 +0000 Subject: [PATCH 20/20] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-15794.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15795.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15796.yml | 4 ---- html/changelogs/AutoChangeLog-pr-15797.yml | 4 ---- html/changelogs/archive/2022-08.yml | 8 ++++++++ 5 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15794.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15795.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15796.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15797.yml diff --git a/html/changelogs/AutoChangeLog-pr-15794.yml b/html/changelogs/AutoChangeLog-pr-15794.yml deleted file mode 100644 index bf8eed830b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15794.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - tweak: "cauteries searing tools and energy scalpels now have heat and can be used to light cigarettes" diff --git a/html/changelogs/AutoChangeLog-pr-15795.yml b/html/changelogs/AutoChangeLog-pr-15795.yml deleted file mode 100644 index a7309183c3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15795.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Stake (maybe)" diff --git a/html/changelogs/AutoChangeLog-pr-15796.yml b/html/changelogs/AutoChangeLog-pr-15796.yml deleted file mode 100644 index 32d3b0b790..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15796.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Caches the auxmos file if found" diff --git a/html/changelogs/AutoChangeLog-pr-15797.yml b/html/changelogs/AutoChangeLog-pr-15797.yml deleted file mode 100644 index 9baa4db7f0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15797.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Sandstorm now happens less often, tends to be less powerful and is announced." diff --git a/html/changelogs/archive/2022-08.yml b/html/changelogs/archive/2022-08.yml index d3fd633d2f..c21c43ef86 100644 --- a/html/changelogs/archive/2022-08.yml +++ b/html/changelogs/archive/2022-08.yml @@ -95,3 +95,11 @@ - rscadd: '[Omega] One decal to better indicate Turbine area' - rscdel: '[Omega] Duplicate leftover intercom' - bugfix: '[Omega] Virology Airlock access buttons should actually work' +2022-08-20: + Putnam3145: + - bugfix: Stake (maybe) + - bugfix: Caches the auxmos file if found + - balance: Sandstorm now happens less often, tends to be less powerful and is announced. + zeroisthebiggay: + - tweak: cauteries searing tools and energy scalpels now have heat and can be used + to light cigarettes