From aa60301e58a5573df68130d925defcbebdd508ca Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:29:04 +0200 Subject: [PATCH 01/68] Fix you will no longer be able to feed without any limit with the fork. (#4174) # About the pull request fixes: https://github.com/cmss13-devs/cmss13/issues/3378 # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: you will no longer be able to feed without any limit with the fork. /:cl: --------- Co-authored-by: Julien --- code/__DEFINES/chemistry.dm | 1 + .../items/reagent_containers/food/snacks.dm | 16 ++++++++-------- code/game/objects/items/tools/kitchen_tools.dm | 4 ++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/__DEFINES/chemistry.dm b/code/__DEFINES/chemistry.dm index 9a29754381f3..078ccbdc2d94 100644 --- a/code/__DEFINES/chemistry.dm +++ b/code/__DEFINES/chemistry.dm @@ -49,6 +49,7 @@ // Nutrition levels #define NUTRITION_MAX 550 +#define NUTRITION_HIGH 540 #define NUTRITION_NORMAL 400 #define NUTRITION_LOW 250 #define NUTRITION_VERYLOW 50 diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index c0e11dac8eb3..06a4d785e677 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -60,7 +60,7 @@ if(istype(M, /mob/living/carbon)) var/mob/living/carbon/C = M var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25) - if(fullness > 540 && world.time < C.overeat_cooldown) + if(fullness > NUTRITION_HIGH && world.time < C.overeat_cooldown) to_chat(user, SPAN_WARNING("[user == M ? "You" : "They"] don't feel like eating more right now.")) return if(issynth(C)) @@ -70,22 +70,22 @@ to_chat(user, SPAN_DANGER("[user == M ? "You are" : "[M] is"] unable to eat!")) return - if(fullness > 540) + if(fullness > NUTRITION_HIGH) C.overeat_cooldown = world.time + OVEREAT_TIME if(M == user)//If you're eating it yourself - if (fullness <= 50) + if (fullness <= NUTRITION_VERYLOW) to_chat(M, SPAN_WARNING("You hungrily chew out a piece of [src] and gobble it!")) - if (fullness > 50 && fullness <= 150) + if (fullness > NUTRITION_VERYLOW && fullness <= NUTRITION_LOW) to_chat(M, SPAN_NOTICE(" You hungrily begin to eat [src].")) - if (fullness > 150 && fullness <= 350) + if (fullness > NUTRITION_LOW && fullness <= NUTRITION_NORMAL) to_chat(M, SPAN_NOTICE(" You take a bite of [src].")) - if (fullness > 350 && fullness <= 540) + if (fullness > NUTRITION_NORMAL && fullness <= NUTRITION_HIGH) to_chat(M, SPAN_NOTICE(" You unwillingly chew a bit of [src].")) - if (fullness > 540) + if (fullness > NUTRITION_HIGH) to_chat(M, SPAN_WARNING("You reluctantly force more of [src] to go down your throat.")) else - if (fullness <= 540) + if (fullness <= NUTRITION_HIGH) user.affected_message(M, SPAN_HELPFUL("You start feeding [user == M ? "yourself" : "[M]"] [src]."), SPAN_HELPFUL("[user] starts feeding you [src]."), diff --git a/code/game/objects/items/tools/kitchen_tools.dm b/code/game/objects/items/tools/kitchen_tools.dm index 98974f25be29..bb763ada9911 100644 --- a/code/game/objects/items/tools/kitchen_tools.dm +++ b/code/game/objects/items/tools/kitchen_tools.dm @@ -45,6 +45,10 @@ return ..() if (reagents.total_volume > 0) + var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25) + if(fullness > NUTRITION_HIGH) + to_chat(user, SPAN_WARNING("[user == M ? "You" : "They"] don't feel like eating more right now.")) + return ..() reagents.set_source_mob(user) reagents.trans_to_ingest(M, reagents.total_volume) if(M == user) From 161421daff1d0d33aca723c66bc18074c7a4c5d5 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:24:39 +0100 Subject: [PATCH 02/68] Automatic changelog for PR #4174 [ci skip] --- html/changelogs/AutoChangeLog-pr-4174.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4174.yml diff --git a/html/changelogs/AutoChangeLog-pr-4174.yml b/html/changelogs/AutoChangeLog-pr-4174.yml new file mode 100644 index 000000000000..f7c1d3071519 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4174.yml @@ -0,0 +1,4 @@ +author: "Huffie56" +delete-after: True +changes: + - bugfix: "you will no longer be able to feed without any limit with the fork." \ No newline at end of file From 05fe9421a62fc38e397112152ac9e9149b9cead9 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:32:52 -0700 Subject: [PATCH 03/68] Fix cade attack speed exploit (#4204) # About the pull request This PR fixes an exploit where dragging could be used to bypass an attack cooldown. # Explain why it's good for the game Fixes #4184 # Testing Photographs and Procedure
Screenshots & Videos https://youtu.be/nIfXqQ6IBw0
# Changelog :cl: Drathek fix: Fixed a cade attack exploit /:cl: --- code/modules/mob/living/carbon/xenomorph/Xenomorph.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index dd53868caf36..cc0c12bd1cc8 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -755,6 +755,9 @@ /mob/living/carbon/xenomorph/start_pulling(atom/movable/AM, lunge, no_msg) + if(next_move >= world.time) + return FALSE + if(SEND_SIGNAL(AM, COMSIG_MOVABLE_XENO_START_PULLING, src) & COMPONENT_ALLOW_PULL) return do_pull(AM, lunge, no_msg) From a8525bdfb9cc14eba9469358b32ff057314fa747 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:33:13 +0100 Subject: [PATCH 04/68] Automatic changelog for PR #4204 [ci skip] --- html/changelogs/AutoChangeLog-pr-4204.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4204.yml diff --git a/html/changelogs/AutoChangeLog-pr-4204.yml b/html/changelogs/AutoChangeLog-pr-4204.yml new file mode 100644 index 000000000000..ff13f229cd0a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4204.yml @@ -0,0 +1,4 @@ +author: "Drathek" +delete-after: True +changes: + - bugfix: "Fixed a cade attack exploit" \ No newline at end of file From c4563d521ed7329816ef5fa840f38d3873fc3f64 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Wed, 23 Aug 2023 00:28:39 +0200 Subject: [PATCH 05/68] fix Whiskey Outpost Chem master will now be connected to the smartfridge. (#4215) # About the pull request fixes: https://github.com/cmss13-devs/cmss13/issues/4207 # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Whiskey Outpost Chem master will now be connected to the smartfridge. /:cl: Co-authored-by: Julien --- .../Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index a39d7d7fffba..6a0e8b169fea 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -868,6 +868,9 @@ "dl" = ( /turf/closed/wall/r_wall/unmeltable, /area/whiskey_outpost/inside/hospital) +"dn" = ( +/turf/open/space/basic, +/area/whiskey_outpost/inside/caves) "dr" = ( /obj/structure/window/reinforced{ dir = 4; @@ -1062,7 +1065,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/inside/caves/tunnel) "dV" = ( -/obj/structure/machinery/chem_master, +/obj/structure/machinery/chem_dispenser, /turf/open/floor{ dir = 9; icon_state = "whitegreen" @@ -1203,9 +1206,8 @@ /turf/open/gm/dirt, /area/whiskey_outpost/inside/caves/tunnel) "ez" = ( -/obj/structure/machinery/chem_dispenser, -/obj/structure/machinery/light/small{ - dir = 8 +/obj/structure/machinery/chem_master{ + tether_range = 4 }, /turf/open/floor{ dir = 1; @@ -1959,7 +1961,9 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) "he" = ( -/obj/structure/machinery/chem_dispenser, +/obj/structure/machinery/chem_master{ + tether_range = 4 + }, /turf/open/floor{ dir = 6; icon_state = "whitegreen" @@ -2426,7 +2430,10 @@ }, /area/whiskey_outpost/outside/north/northeast) "ix" = ( -/obj/structure/machinery/chem_master, +/obj/structure/machinery/chem_dispenser, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/open/floor{ dir = 10; icon_state = "whitegreen" @@ -22662,7 +22669,7 @@ mT mT mT mT -mT +dn mT mT dl @@ -23061,12 +23068,12 @@ mT mT mT mT +dn mT mT mT mT -mT -mT +dn mT mT qz From df691b53b6c94d293cd5346db93f2c0a75c447d8 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Tue, 22 Aug 2023 23:36:56 +0100 Subject: [PATCH 06/68] Automatic changelog for PR #4215 [ci skip] --- html/changelogs/AutoChangeLog-pr-4215.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4215.yml diff --git a/html/changelogs/AutoChangeLog-pr-4215.yml b/html/changelogs/AutoChangeLog-pr-4215.yml new file mode 100644 index 000000000000..d538a7a7be31 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4215.yml @@ -0,0 +1,4 @@ +author: "Huffie56" +delete-after: True +changes: + - bugfix: "Whiskey Outpost Chem master will now be connected to the smartfridge." \ No newline at end of file From aca42a67e9d91bf03d59996274460b3d0bac696f Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 23 Aug 2023 01:04:50 +0000 Subject: [PATCH 07/68] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4035.yml | 13 --------- html/changelogs/AutoChangeLog-pr-4174.yml | 4 --- html/changelogs/AutoChangeLog-pr-4204.yml | 4 --- html/changelogs/AutoChangeLog-pr-4205.yml | 4 --- html/changelogs/AutoChangeLog-pr-4215.yml | 4 --- html/changelogs/AutoChangeLog-pr-4226.yml | 4 --- html/changelogs/archive/2023-08.yml | 33 +++++++++++++++++++++++ 7 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4035.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4174.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4204.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4205.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4215.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4226.yml diff --git a/html/changelogs/AutoChangeLog-pr-4035.yml b/html/changelogs/AutoChangeLog-pr-4035.yml deleted file mode 100644 index 90ffb5a71740..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4035.yml +++ /dev/null @@ -1,13 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - code_imp: "Overhauled how ID accesses are assigned via proc, compiling all the many different procs we used into one." - - rscadd: "Added faction specific accesses to all major factions." - - rscdel: "Removed almost all marine accesses from non marine presets. No more free CIC access to CLF." - - code_imp: "Removed duplicate code in the VAI file." - - rscadd: "Adds a mapping var to indicate a door has non-standard access tags. This is to make it significantly easier for any future access changes to know if they need to look somewhere." - - maptweak: "Applied this var to every door I could find on the Almayer that has non-standard access. Colonies and other stuff to come in a future update." - - rscadd: "Added various new accesses to colonial doors, added WY_SECURITY and WY_RESEARCH to marine research doors." - - maptweak: "Added reinforced piping to lifeboats area. Didn't make much sense for a cruicial part of the evacuation procedures to be prone to spontaneous explosions that can singlehandedly end a marine evacuation without hostiles ever seeing it." - - maptweak: "Added reinforced piping to the research closed loop (it's a closed loop). Also removed CIC access from containment shutters as CIC access can't open the doors." - - maptweak: "Changed a couple walls around research from standard to reinforced, to fit with the containment breach shutters." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4174.yml b/html/changelogs/AutoChangeLog-pr-4174.yml deleted file mode 100644 index f7c1d3071519..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4174.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Huffie56" -delete-after: True -changes: - - bugfix: "you will no longer be able to feed without any limit with the fork." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4204.yml b/html/changelogs/AutoChangeLog-pr-4204.yml deleted file mode 100644 index ff13f229cd0a..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4204.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Drathek" -delete-after: True -changes: - - bugfix: "Fixed a cade attack exploit" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4205.yml b/html/changelogs/AutoChangeLog-pr-4205.yml deleted file mode 100644 index 5615e43f39d2..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4205.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "harryob" -delete-after: True -changes: - - rscadd: "you always see lobby art while the world is setting up" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4215.yml b/html/changelogs/AutoChangeLog-pr-4215.yml deleted file mode 100644 index d538a7a7be31..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4215.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Huffie56" -delete-after: True -changes: - - bugfix: "Whiskey Outpost Chem master will now be connected to the smartfridge." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4226.yml b/html/changelogs/AutoChangeLog-pr-4226.yml deleted file mode 100644 index 781b47852cf1..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4226.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "CapCamIII" -delete-after: True -changes: - - bugfix: "UPP soldier preset works again" \ No newline at end of file diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml index ee712fb75694..03bfd03efef5 100644 --- a/html/changelogs/archive/2023-08.yml +++ b/html/changelogs/archive/2023-08.yml @@ -287,3 +287,36 @@ CapCamIII: - bugfix: fixes the offset on m4ra custom barrel, it should appropriately be sat right on the gun sprite +2023-08-23: + CapCamIII: + - bugfix: UPP soldier preset works again + Drathek: + - bugfix: Fixed a cade attack exploit + Huffie56: + - bugfix: you will no longer be able to feed without any limit with the fork. + - bugfix: Whiskey Outpost Chem master will now be connected to the smartfridge. + harryob: + - rscadd: you always see lobby art while the world is setting up + realforest2001: + - code_imp: Overhauled how ID accesses are assigned via proc, compiling all the + many different procs we used into one. + - rscadd: Added faction specific accesses to all major factions. + - rscdel: Removed almost all marine accesses from non marine presets. No more free + CIC access to CLF. + - code_imp: Removed duplicate code in the VAI file. + - rscadd: Adds a mapping var to indicate a door has non-standard access tags. This + is to make it significantly easier for any future access changes to know if + they need to look somewhere. + - maptweak: Applied this var to every door I could find on the Almayer that has + non-standard access. Colonies and other stuff to come in a future update. + - rscadd: Added various new accesses to colonial doors, added WY_SECURITY and WY_RESEARCH + to marine research doors. + - maptweak: Added reinforced piping to lifeboats area. Didn't make much sense for + a cruicial part of the evacuation procedures to be prone to spontaneous explosions + that can singlehandedly end a marine evacuation without hostiles ever seeing + it. + - maptweak: Added reinforced piping to the research closed loop (it's a closed loop). + Also removed CIC access from containment shutters as CIC access can't open the + doors. + - maptweak: Changed a couple walls around research from standard to reinforced, + to fit with the containment breach shutters. From 295ef51ac6cf072216fb6db860ab9b356a6824b1 Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Wed, 23 Aug 2023 11:31:16 -0700 Subject: [PATCH 08/68] Brings automatic weaponry to the marine and surv arsenal (#4003) # About the pull request Gives full auto to the following guns: m41a (and mk1) m39 HPR (when bipodded) m46c in IFF off type71 mar40 nsg every civvie SMG except the nailgun laser uzi All newly automatic guns fire 20% slower in automatic mode, to balance for the fact that it is much easier to re-aim than burst. This creates a dynamic between the three firemodes: Semi: - Best accuracy - Lowest DPS Burst: - Okay accuracy - Highest DPS Auto: - Okay (it depends) accuracy, but you are able to adjust for a moving target unlike burst. - Slightly lower DPS # Explain why it's good for the game Guns not having autofire feels... pretty rough. This PR will bring CM to a more modern time, while reducing the number of players diagnosed with carpal tunnel yearly. # Testing Photographs and Procedure I went through and tested pretty much every base gun, but I cannot guarantee that they all handle well. Lemme know if something's off. # Changelog :cl: balance: The M41A, M41Amk1, m39, m46c (iff off), mar-30/40/60, type 71, laser uzi, and every SMG now has automatic fire. To compensate for the ability to re-aim (unlike burst), the guns fire 20% slower while automatic. This does not apply to already-existing automatic weaponry. balance: The HPR can now fire in full auto when bipodded. fix: Adding/removing attachments now keeps the current firemode, if possible. fix: The dualtube and spec sniper now can switch tubes/toggle laser again fix: Fixed a long-standing exploit with bipods and scopes. fix: Fixed guns jamming when shooting UI elements. fix: Fixed a bunch of guns unintentionally having burst. balance: You can transfer ammo between HPR ammo boxes by hitting one with another. /:cl: --------- Co-authored-by: John Doe Co-authored-by: Benedict --- code/__DEFINES/conflict.dm | 4 ++- .../dcs/signals/atom/signals_item.dm | 6 ++++ code/_globalvars/bitfields.dm | 1 + code/datums/components/autofire/autofire.dm | 9 ++++-- code/datums/supply_packs/ammo.dm | 10 ------- code/datums/supply_packs/black_market.dm | 7 ++--- code/modules/clothing/shoes/miscellaneous.dm | 4 +-- code/modules/projectiles/ammunition.dm | 11 ++++--- code/modules/projectiles/gun.dm | 23 +++++++++----- code/modules/projectiles/gun_attachables.dm | 30 +++++++++++++++++-- code/modules/projectiles/gun_helpers.dm | 9 ++++++ code/modules/projectiles/guns/energy.dm | 2 ++ .../modules/projectiles/guns/flamer/flamer.dm | 2 +- code/modules/projectiles/guns/rifles.dm | 12 ++++++-- code/modules/projectiles/guns/shotguns.dm | 13 +++++--- code/modules/projectiles/guns/smgs.dm | 8 +++-- code/modules/projectiles/guns/souto.dm | 2 ++ code/modules/projectiles/guns/specialist.dm | 14 +++++---- code/modules/projectiles/magazines/rifles.dm | 2 +- code/modules/projectiles/projectile.dm | 11 +++++-- 20 files changed, 130 insertions(+), 50 deletions(-) diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm index 7a1b322a19ee..30b2627bb1b0 100644 --- a/code/__DEFINES/conflict.dm +++ b/code/__DEFINES/conflict.dm @@ -68,7 +68,7 @@ #define GUN_ANTIQUE (1<<13) /// Whether the gun has been fired by its current user (reset upon `dropped()`) #define GUN_RECOIL_BUILDUP (1<<14) -/// support weapon, bipod will grant IFF +/// support weapon, bipod will grant autofire #define GUN_SUPPORT_PLATFORM (1<<15) /// No gun description, only base desc #define GUN_NO_DESCRIPTION (1<<16) @@ -99,6 +99,8 @@ #define AMMUNITION_HANDFUL_BOX (1<<2) #define AMMUNITION_HIDE_AMMO (1<<3) #define AMMUNITION_CANNOT_REMOVE_BULLETS (1<<4) +/// If this magazine can transfer to other magazines of the same type by slapping one with the other +#define AMMUNITION_SLAP_TRANSFER (1<<5) //Slowdown from various armors. /// How much shoes slow you down by default. Negative values speed you up diff --git a/code/__DEFINES/dcs/signals/atom/signals_item.dm b/code/__DEFINES/dcs/signals/atom/signals_item.dm index 138e88d21746..b7bbca9f64a3 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_item.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_item.dm @@ -54,3 +54,9 @@ #define COMSIG_GUN_AUTOFIREDELAY_MODIFIED "gun_autofiredelay_modified" #define COMSIG_GUN_BURST_SHOTS_TO_FIRE_MODIFIED "gun_burst_shots_to_fire_modified" #define COMSIG_GUN_BURST_SHOT_DELAY_MODIFIED "gun_burst_shot_delay_modified" + +/// from /obj/item/weapon/gun/proc/recalculate_attachment_bonuses() : () +#define COMSIG_GUN_RECALCULATE_ATTACHMENT_BONUSES "gun_recalculate_attachment_bonuses" + +/// from /obj/item/weapon/gun/proc/load_into_chamber() : () +#define COMSIG_GUN_INTERRUPT_FIRE "gun_interrupt_fire" diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 4936609d892e..d71125c318f6 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -128,6 +128,7 @@ DEFINE_BITFIELD(flags_magazine, list( "AMMUNITION_HANDFUL_BOX" = AMMUNITION_HANDFUL_BOX, "AMMUNITION_HIDE_AMMO" = AMMUNITION_HIDE_AMMO, "AMMUNITION_CANNOT_REMOVE_BULLETS" = AMMUNITION_CANNOT_REMOVE_BULLETS, + "AMMUNITION_SLAP_TRANSFER" = AMMUNITION_SLAP_TRANSFER, )) DEFINE_BITFIELD(flags_atom, list( diff --git a/code/datums/components/autofire/autofire.dm b/code/datums/components/autofire/autofire.dm index 31ca255f1b88..2b9401e8d346 100644 --- a/code/datums/components/autofire/autofire.dm +++ b/code/datums/components/autofire/autofire.dm @@ -15,6 +15,8 @@ var/have_to_reset_at_burst_end = FALSE ///If we are in a burst var/bursting = FALSE + /// The multiplier for how much slower the parent should fire in automatic mode. 1 is normal, 1.2 is 20% slower, 2 is 100% slower, etc. + var/automatic_delay_mult = 1 ///Callback to set bursting mode on the parent var/datum/callback/callback_bursting ///Callback to ask the parent to reset its firing vars @@ -26,7 +28,7 @@ ///Callback to set parent's fa_firing var/datum/callback/callback_set_firing -/datum/component/automatedfire/autofire/Initialize(auto_fire_shot_delay = 0.3 SECONDS, burstfire_shot_delay, burst_shots_to_fire = 3, fire_mode = GUN_FIREMODE_SEMIAUTO, datum/callback/callback_bursting, datum/callback/callback_reset_fire, datum/callback/callback_fire, datum/callback/callback_display_ammo, datum/callback/callback_set_firing) +/datum/component/automatedfire/autofire/Initialize(auto_fire_shot_delay = 0.3 SECONDS, burstfire_shot_delay, burst_shots_to_fire = 3, fire_mode = GUN_FIREMODE_SEMIAUTO, automatic_delay_mult = 1, datum/callback/callback_bursting, datum/callback/callback_reset_fire, datum/callback/callback_fire, datum/callback/callback_display_ammo, datum/callback/callback_set_firing) . = ..() RegisterSignal(parent, COMSIG_GUN_FIRE_MODE_TOGGLE, PROC_REF(modify_fire_mode)) @@ -35,11 +37,13 @@ RegisterSignal(parent, COMSIG_GUN_BURST_SHOT_DELAY_MODIFIED, PROC_REF(modify_burstfire_shot_delay)) RegisterSignal(parent, COMSIG_GUN_FIRE, PROC_REF(initiate_shot)) RegisterSignal(parent, COMSIG_GUN_STOP_FIRE, PROC_REF(stop_firing)) + RegisterSignal(parent, COMSIG_GUN_INTERRUPT_FIRE, PROC_REF(hard_reset)) src.auto_fire_shot_delay = auto_fire_shot_delay src.burstfire_shot_delay = burstfire_shot_delay src.burst_shots_to_fire = burst_shots_to_fire src.fire_mode = fire_mode + src.automatic_delay_mult = automatic_delay_mult src.callback_bursting = callback_bursting src.callback_reset_fire = callback_reset_fire src.callback_fire = callback_fire @@ -96,6 +100,7 @@ ///Hard reset the autofire, happens when the shooter fall/is thrown, at the end of a burst or when it runs out of ammunition /datum/component/automatedfire/autofire/proc/hard_reset() + SIGNAL_HANDLER callback_reset_fire.Invoke() //resets the gun shots_fired = 0 have_to_reset_at_burst_end = FALSE @@ -131,7 +136,7 @@ next_fire = world.time + burstfire_shot_delay if(GUN_FIREMODE_AUTOMATIC) callback_set_firing.Invoke(TRUE) - next_fire = world.time + auto_fire_shot_delay + next_fire = world.time + (auto_fire_shot_delay * automatic_delay_mult) if(GUN_FIREMODE_SEMIAUTO) return schedule_shot() diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index e598a11be5e0..164511c25cc0 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -122,16 +122,6 @@ containername = "\improper M39 AP magazines crate" group = "Ammo" -/datum/supply_packs/ammo_smg_mag_box_ext - name = "Magazine box (M39, 10x extended mags)" - contains = list( - /obj/item/ammo_box/magazine/m39/ext, - ) - cost = 30 - containertype = /obj/structure/closet/crate/ammo - containername = "\improper M39 extended magazines crate" - group = "Ammo" - //------------------------For M4RA---------------- /datum/supply_packs/ammo_m4ra_mag_box diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 65b15997d1b4..3f4453d03f32 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -184,10 +184,9 @@ Non-USCM items, from CLF, UPP, colonies, etc. Mostly combat-related. new /obj/item/ammo_magazine/rifle/mar40/extended(src) new /obj/item/ammo_magazine/rifle/mar40(src) else - new /obj/item/weapon/gun/rifle/m41aMK1/tactical(src) - new /obj/item/ammo_magazine/rifle/m41aMK1/ap(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) - new /obj/item/ammo_magazine/rifle/m41aMK1(src) + new /obj/item/weapon/gun/rifle/mar40/lmg(src) + new /obj/item/ammo_magazine/rifle/mar40/lmg(src) + new /obj/item/ammo_magazine/rifle/mar40/lmg(src) /* Misc. Individual Guns */ diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 9d53ac1103c0..e3b07a76a2ff 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -159,8 +159,8 @@ max_heat_protection_temperature = SHOE_MAX_HEAT_PROT /obj/item/clothing/shoes/souto - name = "\improper Souto Man's boots. Harder than the kick of Souto Red." - desc = "Souto Man boots" + name = "Souto Man boots" + desc = "\improper Souto Man's boots. Harder than the kick of Souto Red" icon_state = "souto_man" item_state = "souto_man" flags_inventory = CANTSTRIP|NOSLIPPING diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 1947f87c574a..d747525f3feb 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -116,14 +116,17 @@ They're all essentially identical when it comes to getting the job done. /obj/item/ammo_magazine/attackby(obj/item/I, mob/living/user, bypass_hold_check = 0) if(istype(I, /obj/item/ammo_magazine)) var/obj/item/ammo_magazine/MG = I - if(MG.flags_magazine & AMMUNITION_HANDFUL) //got a handful of bullets + if((MG.flags_magazine & AMMUNITION_HANDFUL) || (MG.flags_magazine & AMMUNITION_SLAP_TRANSFER)) //got a handful of bullets if(flags_magazine & AMMUNITION_REFILLABLE) //and a refillable magazine var/obj/item/ammo_magazine/handful/transfer_from = I if(src == user.get_inactive_hand() || bypass_hold_check) //It has to be held. if(default_ammo == transfer_from.default_ammo) - transfer_ammo(transfer_from,user,transfer_from.current_rounds) // This takes care of the rest. - else to_chat(user, "Those aren't the same rounds. Better not mix them up.") - else to_chat(user, "Try holding [src] before you attempt to restock it.") + if(transfer_ammo(transfer_from,user,transfer_from.current_rounds)) // This takes care of the rest. + to_chat(user, SPAN_NOTICE("You transfer rounds to [src] from [transfer_from].")) + else + to_chat(user, SPAN_NOTICE("Those aren't the same rounds. Better not mix them up.")) + else + to_chat(user, SPAN_NOTICE("Try holding [src] before you attempt to restock it.")) //Generic proc to transfer ammo between ammo mags. Can work for anything, mags, handfuls, etc. /obj/item/ammo_magazine/proc/transfer_ammo(obj/item/ammo_magazine/source, mob/user, transfer_amount = 1) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 832f243a9602..257edd9a7720 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -127,7 +127,7 @@ ///How many full-auto shots to get to max scatter? var/fa_scatter_peak = 4 ///How bad does the scatter get on full auto? - var/fa_max_scatter = 8.5 + var/fa_max_scatter = 6.5 ///Click parameters to use when firing full-auto var/fa_params = null @@ -228,6 +228,8 @@ VAR_PROTECTED/start_semiauto = TRUE /// If this gun should spawn with automatic fire. Protected due to it never needing to be edited. VAR_PROTECTED/start_automatic = FALSE + /// The multiplier for how much slower this should fire in automatic mode. 1 is normal, 1.2 is 20% slower, 2 is 100% slower, etc. Protected due to it never needing to be edited. + VAR_PROTECTED/autofire_slow_mult = 1 /** @@ -274,7 +276,7 @@ AddElement(/datum/element/drop_retrieval/gun, auto_retrieval_slot) update_icon() //for things like magazine overlays gun_firemode = gun_firemode_list[1] || GUN_FIREMODE_SEMIAUTO - AddComponent(/datum/component/automatedfire/autofire, fire_delay, burst_delay, burst_amount, gun_firemode, CALLBACK(src, PROC_REF(set_bursting)), CALLBACK(src, PROC_REF(reset_fire)), CALLBACK(src, PROC_REF(fire_wrapper)), CALLBACK(src, PROC_REF(display_ammo)), CALLBACK(src, PROC_REF(set_auto_firing))) //This should go after handle_starting_attachment() and setup_firemodes() to get the proper values set. + AddComponent(/datum/component/automatedfire/autofire, fire_delay, burst_delay, burst_amount, gun_firemode, autofire_slow_mult, CALLBACK(src, PROC_REF(set_bursting)), CALLBACK(src, PROC_REF(reset_fire)), CALLBACK(src, PROC_REF(fire_wrapper)), CALLBACK(src, PROC_REF(display_ammo)), CALLBACK(src, PROC_REF(set_auto_firing))) //This should go after handle_starting_attachment() and setup_firemodes() to get the proper values set. /obj/item/weapon/gun/proc/set_gun_attachment_offsets() attachable_offset = null @@ -425,6 +427,10 @@ else if(M.r_hand == src) M.update_inv_r_hand() + setup_firemodes() + + SEND_SIGNAL(src, COMSIG_GUN_RECALCULATE_ATTACHMENT_BONUSES) + /obj/item/weapon/gun/proc/handle_random_attachments() var/attachmentchoice @@ -939,6 +945,10 @@ and you're good to go. //Let's check on the active attachable. It loads ammo on the go, so it never chambers anything if(active_attachable) + if(shots_fired >= 1) // This is what you'll want to remove if you want automatic underbarrel guns in the future + SEND_SIGNAL(src, COMSIG_GUN_INTERRUPT_FIRE) + return + if(active_attachable.current_rounds > 0) //If it's still got ammo and stuff. active_attachable.current_rounds-- var/obj/item/projectile/bullet = create_bullet(active_attachable.ammo, initial(name)) @@ -1073,10 +1083,10 @@ and you're good to go. This is where the grenade launcher and flame thrower function as attachments. This is also a general check to see if the attachment can fire in the first place. */ - var/check_for_attachment_fire = 0 + var/check_for_attachment_fire = FALSE if(active_attachable?.flags_attach_features & ATTACH_WEAPON) //Attachment activated and is a weapon. - check_for_attachment_fire = 1 + check_for_attachment_fire = TRUE if(!(active_attachable.flags_attach_features & ATTACH_PROJECTILE)) //If it's unique projectile, this is where we fire it. if((active_attachable.current_rounds <= 0) && !(active_attachable.flags_attach_features & ATTACH_IGNORE_EMPTY)) click_empty(user) //If it's empty, let them know. @@ -1202,8 +1212,7 @@ and you're good to go. shots_fired++ - else // This happens in very rare circumstances when you're moving a lot while burst firing, so I'm going to toss it up to guns jamming. - clear_jam(projectile_to_fire,user) + else return TRUE //>>POST PROCESSING AND CLEANUP BEGIN HERE.<< @@ -1892,7 +1901,7 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed if(!target) target = src.target if(!user) - user = src.gun_user + user = gun_user return Fire(target, user, params, reflex, dual_wield) /// Setter proc for fa_firing diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 7d2dbf5288be..eb0e53986f9d 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -852,6 +852,28 @@ Defined in conflicts.dm of the #defines folder. delay_scoped_nerf = FIRE_DELAY_TIER_11 //to compensate initial debuff. We want "high_fire_delay" damage_falloff_scoped_buff = -0.4 //has to be negative +/obj/item/attachable/scope/Attach(obj/item/weapon/gun/gun) + . = ..() + RegisterSignal(gun, COMSIG_GUN_RECALCULATE_ATTACHMENT_BONUSES, PROC_REF(handle_attachment_recalc)) + +/obj/item/attachable/scope/Detach(mob/user, obj/item/weapon/gun/detaching_gub) + . = ..() + UnregisterSignal(detaching_gub, COMSIG_GUN_RECALCULATE_ATTACHMENT_BONUSES) + + +/// Due to the bipod's interesting way of handling stat modifications, this is necessary to prevent exploits. +/obj/item/attachable/scope/proc/handle_attachment_recalc(obj/item/weapon/gun/source) + SIGNAL_HANDLER + + if(!source.zoom) + return + + if(using_scope) + source.accuracy_mult += accuracy_scoped_buff + source.modify_fire_delay(delay_scoped_nerf) + source.damage_falloff_mult += damage_falloff_scoped_buff + + /obj/item/attachable/scope/proc/apply_scoped_buff(obj/item/weapon/gun/G, mob/living/carbon/user) if(G.zoom) G.accuracy_mult += accuracy_scoped_buff @@ -1976,6 +1998,8 @@ Defined in conflicts.dm of the #defines folder. G.damage_mult = 1 icon_state += "-on" + SEND_SIGNAL(G, COMSIG_GUN_INTERRUPT_FIRE) + for(var/X in G.actions) var/datum/action/A = X A.update_button_icon() @@ -2646,13 +2670,14 @@ Defined in conflicts.dm of the #defines folder. burst_scatter_mod = 0 delay_mod = FIRE_DELAY_TIER_12 G.recalculate_attachment_bonuses() + G.stop_fire() var/mob/living/user if(isliving(G.loc)) user = G.loc UnregisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK) if(G.flags_gun_features & GUN_SUPPORT_PLATFORM) - G.remove_bullet_trait("iff") + G.remove_firemode(GUN_FIREMODE_AUTOMATIC) if(!QDELETED(G)) playsound(user,'sound/items/m56dauto_rotate.ogg', 55, 1) @@ -2683,12 +2708,13 @@ Defined in conflicts.dm of the #defines folder. else delay_mod = -FIRE_DELAY_TIER_12 G.recalculate_attachment_bonuses() + G.stop_fire() initial_mob_dir = user.dir RegisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(handle_mob_move_or_look)) if(G.flags_gun_features & GUN_SUPPORT_PLATFORM) - G.add_bullet_trait(BULLET_TRAIT_ENTRY_ID("iff", /datum/element/bullet_trait_iff)) + G.add_firemode(GUN_FIREMODE_AUTOMATIC) else to_chat(user, SPAN_NOTICE("You retract [src].")) diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index a60773c88be7..e86801c9d8c1 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -700,6 +700,9 @@ DEFINES in setup.dm, referenced here. CRASH("add_firemode called with a resulting gun_firemode_list length of [length(gun_firemode_list)].") /obj/item/weapon/gun/proc/remove_firemode(removed_firemode, mob/user) + if(!(removed_firemode in gun_firemode_list)) + return + if(!length(gun_firemode_list) || (length(gun_firemode_list) == 1)) CRASH("remove_firemode called with gun_firemode_list length [length(gun_firemode_list)].") @@ -710,7 +713,9 @@ DEFINES in setup.dm, referenced here. do_toggle_firemode(user, gun_firemode) /obj/item/weapon/gun/proc/setup_firemodes() + var/old_firemode = gun_firemode gun_firemode_list.len = 0 + if(start_semiauto) gun_firemode_list |= GUN_FIREMODE_SEMIAUTO @@ -722,6 +727,10 @@ DEFINES in setup.dm, referenced here. if(!length(gun_firemode_list)) CRASH("[src] called setup_firemodes() with an empty gun_firemode_list") + + else if(old_firemode in gun_firemode_list) + gun_firemode = old_firemode + else gun_firemode = gun_firemode_list[1] diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 61ea0442a427..5733b01195ff 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -181,6 +181,7 @@ fire_sound = 'sound/weapons/Laser4.ogg' has_charge_meter = FALSE charge_icon = "+laz_uzi_empty" + start_automatic = TRUE /obj/item/weapon/gun/energy/laz_uzi/set_gun_config_values() ..() @@ -194,6 +195,7 @@ scatter_unwielded = SCATTER_AMOUNT_TIER_6 damage_mult = BASE_BULLET_DAMAGE_MULT recoil_unwielded = RECOIL_AMOUNT_TIER_5 + fa_scatter_peak = SCATTER_AMOUNT_TIER_8 //############################ Taser ################## // Lots of bits for it so splitting off an area diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm index a108b3a9948f..ee08fee0f845 100644 --- a/code/modules/projectiles/guns/flamer/flamer.dm +++ b/code/modules/projectiles/guns/flamer/flamer.dm @@ -370,7 +370,7 @@ /obj/item/weapon/gun/flamer/M240T/auto/set_gun_config_values() . = ..() - set_fire_delay(FIRE_DELAY_TIER_3) + set_fire_delay(FIRE_DELAY_TIER_7) GLOBAL_LIST_EMPTY(flamer_particles) /particles/flamer_fire diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 18ffb082217c..38649ff73ca1 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -75,6 +75,7 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER starting_attachment_types = list(/obj/item/attachable/attached_gun/grenade, /obj/item/attachable/stock/rifle/collapsible) map_specific_decoration = TRUE + start_automatic = TRUE /obj/item/weapon/gun/rifle/m41a/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 18,"rail_x" = 12, "rail_y" = 23, "under_x" = 24, "under_y" = 13, "stock_x" = 24, "stock_y" = 13) @@ -88,7 +89,6 @@ accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_4 + 2*HIT_ACCURACY_MULT_TIER_1 accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_7 scatter = SCATTER_AMOUNT_TIER_8 - //fa_scatter_peak = FULL_AUTO_SCATTER_PEAK_TIER_8 //Zonenote burst_scatter_mult = SCATTER_AMOUNT_TIER_10 scatter_unwielded = SCATTER_AMOUNT_TIER_2 damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_2 @@ -150,6 +150,7 @@ /obj/item/attachable/attached_gun/flamer/advanced, ) start_semiauto = FALSE + start_automatic = TRUE /obj/item/weapon/gun/rifle/nsg23/Initialize(mapload, spawn_empty) . = ..() @@ -171,6 +172,7 @@ damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_8 recoil_unwielded = RECOIL_AMOUNT_TIER_2 damage_falloff_mult = 0 + fa_max_scatter = SCATTER_AMOUNT_TIER_5 /obj/item/weapon/gun/rifle/nsg23/handle_starting_attachment() ..() @@ -383,6 +385,7 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER starting_attachment_types = list(/obj/item/attachable/attached_gun/grenade/mk1, /obj/item/attachable/stock/rifle/collapsible) + start_automatic = TRUE /obj/item/weapon/gun/rifle/m41aMK1/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 18,"rail_x" = 12, "rail_y" = 23, "under_x" = 23, "under_y" = 13, "stock_x" = 24, "stock_y" = 14) @@ -528,6 +531,7 @@ scatter_unwielded = SCATTER_AMOUNT_TIER_2 damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_3 recoil_unwielded = RECOIL_AMOUNT_TIER_2 + fa_max_scatter = SCATTER_AMOUNT_TIER_7 /obj/item/weapon/gun/rifle/m46c/able_to_fire(mob/user) . = ..() @@ -633,9 +637,11 @@ if(iff_enabled) modify_fire_delay(FIRE_DELAY_TIER_12) remove_firemode(GUN_FIREMODE_BURSTFIRE) + remove_firemode(GUN_FIREMODE_AUTOMATIC) else add_firemode(GUN_FIREMODE_BURSTFIRE) + add_firemode(GUN_FIREMODE_AUTOMATIC) /obj/item/weapon/gun/rifle/m46c/proc/name_after_co(mob/living/carbon/human/H) @@ -719,6 +725,7 @@ ) flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK + start_automatic = TRUE @@ -1232,7 +1239,7 @@ /obj/item/attachable/magnetic_harness, ) - flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY + flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_SUPPORT_PLATFORM gun_category = GUN_CATEGORY_HEAVY /obj/item/weapon/gun/rifle/lmg/set_gun_attachment_offsets() @@ -1297,6 +1304,7 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER flags_equip_slot = SLOT_BACK + start_automatic = TRUE /obj/item/weapon/gun/rifle/type71/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 18,"rail_x" = 18, "rail_y" = 23, "under_x" = 20, "under_y" = 13, "stock_x" = 24, "stock_y" = 13) diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index a154062c9d10..3c366df40b57 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -1186,7 +1186,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/pump/dual_tube name = "generic dual-tube pump shotgun" - desc = "A twenty-round pump action shotgun with dual internal tube magazines. You can switch the active internal magazine by toggling burst fire mode." + desc = "A twenty-round pump action shotgun with dual internal tube magazines. You can switch the active internal magazine by toggling the shotgun tube." current_mag = /obj/item/ammo_magazine/internal/shotgun var/obj/item/ammo_magazine/internal/shotgun/primary_tube var/obj/item/ammo_magazine/internal/shotgun/secondary_tube @@ -1220,7 +1220,12 @@ can cause issues with ammo types getting mixed up during the burst. playsound(src, 'sound/machines/switch.ogg', 15, TRUE) return TRUE -/obj/item/weapon/gun/shotgun/pump/dual_tube/set_bursting() +/obj/item/weapon/gun/shotgun/pump/dual_tube/verb/toggle_tube() + set category = "Weapons" + set name = "Toggle Shotgun Tube" + set desc = "Toggles which shotgun tube your gun loads from." + set src = usr.contents + var/obj/item/weapon/gun/shotgun/pump/dual_tube/shotgun = get_active_firearm(usr) if(shotgun == src) swap_tube(usr) @@ -1229,7 +1234,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb name = "\improper HG 37-12 pump shotgun" - desc = "A eight-round pump action shotgun with four-round capacity dual internal tube magazines allowing for quick reloading and highly accurate fire. Used exclusively by Colonial Marshals. You can switch the active internal magazine by toggling burst fire mode." + desc = "A eight-round pump action shotgun with four-round capacity dual internal tube magazines allowing for quick reloading and highly accurate fire. Used exclusively by Colonial Marshals. You can switch the active internal magazine by toggling the shotgun tube." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi' icon_state = "hg3712" item_state = "hg3712" @@ -1269,7 +1274,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717 name = "\improper M37-17 pump shotgun" - desc = "A military version of the iconic HG 37-12, this design can fit one extra shell in each of its dual-tube internal magazines, and fires shells with increased velocity, resulting in more damage. Issued to select USCM vessels out on the rim. You can switch the active internal magazine by toggling burst fire mode." + desc = "A military version of the iconic HG 37-12, this design can fit one extra shell in each of its dual-tube internal magazines, and fires shells with increased velocity, resulting in more damage. Issued to select USCM vessels out on the rim. You can switch the active internal magazine by toggling the shotgun tube." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m3717" item_state = "m3717" diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index 70b0acb3f2c8..b9c2b9c3514d 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -20,6 +20,7 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK gun_category = GUN_CATEGORY_SMG + start_automatic = TRUE /obj/item/weapon/gun/smg/Initialize(mapload, spawn_empty) . = ..() @@ -32,6 +33,7 @@ /obj/item/weapon/gun/smg/set_gun_config_values() ..() movement_onehanded_acc_penalty_mult = 4 + fa_max_scatter = SCATTER_AMOUNT_TIER_5 //------------------------------------------------------- //M39 SMG @@ -85,6 +87,7 @@ scatter_unwielded = SCATTER_AMOUNT_TIER_4 damage_mult = BASE_BULLET_DAMAGE_MULT recoil_unwielded = RECOIL_AMOUNT_TIER_5 + fa_max_scatter = SCATTER_AMOUNT_TIER_10 + 0.5 /obj/item/weapon/gun/smg/m39/training @@ -270,6 +273,8 @@ scatter_unwielded = SCATTER_AMOUNT_TIER_4 damage_mult = BASE_BULLET_DAMAGE_MULT recoil_unwielded = RECOIL_AMOUNT_TIER_5 + fa_max_scatter = SCATTER_AMOUNT_TIER_9 + fa_scatter_peak = 1 // Seems a bit funny, but it works pretty well in the end /obj/item/weapon/gun/smg/ppsh/with_drum_mag current_mag = /obj/item/ammo_magazine/smg/ppsh/extended @@ -361,7 +366,6 @@ ) wield_delay = WIELD_DELAY_NONE aim_slowdown = SLOWDOWN_ADS_NONE - start_automatic = TRUE /obj/item/weapon/gun/smg/mac15/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 20,"rail_x" = 16, "rail_y" = 22, "under_x" = 22, "under_y" = 16, "stock_x" = 22, "stock_y" = 16) @@ -410,7 +414,6 @@ ) wield_delay = WIELD_DELAY_MIN aim_slowdown = SLOWDOWN_ADS_QUICK - start_automatic = TRUE var/jammed = FALSE /obj/item/weapon/gun/smg/uzi/set_gun_attachment_offsets() @@ -567,6 +570,7 @@ flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK gun_category = GUN_CATEGORY_SMG civilian_usable_override = TRUE + start_automatic = FALSE var/nailing_speed = 2 SECONDS //Time to apply a sheet for patching. Also haha name. Try to keep sync with soundbyte duration var/repair_sound = 'sound/weapons/nailgun_repair_long.ogg' diff --git a/code/modules/projectiles/guns/souto.dm b/code/modules/projectiles/guns/souto.dm index 8d7a1b2550a4..6f45f57e1d61 100644 --- a/code/modules/projectiles/guns/souto.dm +++ b/code/modules/projectiles/guns/souto.dm @@ -14,6 +14,8 @@ var/obj/item/storage/backpack/souto/soutopack current_mag = null auto_retrieval_slot = WEAR_IN_BACK + start_automatic = TRUE + autofire_slow_mult = 0.8 //Fires FASTER when in Full Auto, that is the power of Souta /obj/item/weapon/gun/souto/set_gun_config_values() . = ..() diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm index 7152106869a9..a73335971ffa 100644 --- a/code/modules/projectiles/guns/specialist.dm +++ b/code/modules/projectiles/guns/specialist.dm @@ -267,11 +267,15 @@ if(toggling_action) toggling_action.update_button_icon() -/obj/item/weapon/gun/rifle/sniper/set_bursting(mob/user) - if(has_aimed_shot) - toggle_laser(user) - else - ..() +/obj/item/weapon/gun/rifle/sniper/verb/toggle_gun_laser() + set category = "Weapons" + set name = "Toggle Laser" + set desc = "Toggles your laser on or off." + set src = usr.contents + + var/obj/item/weapon/gun/rifle/sniper/sniper = get_active_firearm(usr) + if((sniper == src) && has_aimed_shot) + toggle_laser(usr) //Pow! Headshot. /obj/item/weapon/gun/rifle/sniper/M42A diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index ca008c2d1376..57bcd7f0a563 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -263,7 +263,7 @@ icon_state = "m41ae2" max_rounds = 300 gun_type = /obj/item/weapon/gun/rifle/lmg - flags_magazine = AMMUNITION_CANNOT_REMOVE_BULLETS|AMMUNITION_REFILLABLE + flags_magazine = AMMUNITION_CANNOT_REMOVE_BULLETS|AMMUNITION_REFILLABLE|AMMUNITION_SLAP_TRANSFER ammo_band_icon = "+m41ae2_band" ammo_band_icon_empty = "+m41ae2_band_e" diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index e4251f5f6b31..eccba14a442a 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -110,7 +110,7 @@ /obj/item/projectile/Crossed(atom/movable/AM) /* Fun fact: Crossed is called for any contents involving operations. * This notably means, inserting a magazing in a gun Crossed() it with the bullets in the gun. */ - if(!loc.z) + if(!loc?.z) return // Not on the map. Don't scan a turf. Don't shoot the poor guy reloading his gun. if(AM && !(AM in permutated)) if(scan_a_turf(get_turf(AM))) @@ -1143,11 +1143,16 @@ // Need to do this in order to prevent the ping from being deleted addtimer(CALLBACK(I, TYPE_PROC_REF(/image, flick_overlay), src, 3), 1) +/// People getting shot by a large amount of bullets in a very short period of time can lag them out, with chat messages being one cause, so a 1s cooldown per hit message is introduced to assuage that +/mob/var/shot_cooldown = 0 + /mob/proc/bullet_message(obj/item/projectile/P) if(!P) return - visible_message(SPAN_DANGER("[src] is hit by the [P.name] in the [parse_zone(P.def_zone)]!"), \ - SPAN_HIGHDANGER("You are hit by the [P.name] in the [parse_zone(P.def_zone)]!"), null, 4, CHAT_TYPE_TAKING_HIT) + if(COOLDOWN_FINISHED(src, shot_cooldown)) + visible_message(SPAN_DANGER("[src] is hit by the [P.name] in the [parse_zone(P.def_zone)]!"), \ + SPAN_HIGHDANGER("You are hit by the [P.name] in the [parse_zone(P.def_zone)]!"), null, 4, CHAT_TYPE_TAKING_HIT) + COOLDOWN_START(src, shot_cooldown, 1 SECONDS) last_damage_data = P.weapon_cause_data if(P.firer && ismob(P.firer)) From 0827f83a79aaec464a8a268318d3fe6e65d801e5 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 23 Aug 2023 19:42:42 +0100 Subject: [PATCH 09/68] Automatic changelog for PR #4003 [ci skip] --- html/changelogs/AutoChangeLog-pr-4003.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4003.yml diff --git a/html/changelogs/AutoChangeLog-pr-4003.yml b/html/changelogs/AutoChangeLog-pr-4003.yml new file mode 100644 index 000000000000..3adbfb8f0eb0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4003.yml @@ -0,0 +1,11 @@ +author: "Zonespace27" +delete-after: True +changes: + - balance: "The M41A, M41Amk1, m39, m46c (iff off), mar-30/40/60, type 71, laser uzi, and every SMG now has automatic fire. To compensate for the ability to re-aim (unlike burst), the guns fire 20% slower while automatic. This does not apply to already-existing automatic weaponry." + - balance: "The HPR can now fire in full auto when bipodded." + - bugfix: "Adding/removing attachments now keeps the current firemode, if possible." + - bugfix: "The dualtube and spec sniper now can switch tubes/toggle laser again" + - bugfix: "Fixed a long-standing exploit with bipods and scopes." + - bugfix: "Fixed guns jamming when shooting UI elements." + - bugfix: "Fixed a bunch of guns unintentionally having burst." + - balance: "You can transfer ammo between HPR ammo boxes by hitting one with another." \ No newline at end of file From d260ac0b009df69eee7dac551599dd0e933e973b Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Wed, 23 Aug 2023 15:51:23 -0400 Subject: [PATCH 10/68] Possible fix for binoc perma zoom (#4176) # About the pull request I have no consistent reproducibility for this but this may fix it? Seems to occur when an explosion blows up the binocs in the hand of the person while zoomed. # Explain why it's good for the game Bug bad # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Morrow fix: Possible fix for binoc perma zoom /:cl: --- code/game/objects/items.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dd5e99545d11..a98a9c25d1aa 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -829,6 +829,7 @@ cases. Override_icon_state should be a list.*/ UnregisterSignal(src, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_UNWIELD, + COMSIG_PARENT_QDELETING, )) UnregisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK) //General reset in case anything goes wrong, the view will always reset to default unless zooming in. @@ -861,6 +862,7 @@ cases. Override_icon_state should be a list.*/ RegisterSignal(src, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_UNWIELD, + COMSIG_PARENT_QDELETING, ), PROC_REF(unzoom_dropped_callback)) RegisterSignal(user, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(zoom_handle_mob_move_or_look)) From f10806d4b8393ed4d5f303e2a227629175aa8cb9 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 23 Aug 2023 20:59:22 +0100 Subject: [PATCH 11/68] Automatic changelog for PR #4176 [ci skip] --- html/changelogs/AutoChangeLog-pr-4176.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4176.yml diff --git a/html/changelogs/AutoChangeLog-pr-4176.yml b/html/changelogs/AutoChangeLog-pr-4176.yml new file mode 100644 index 000000000000..80308102ce82 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4176.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - bugfix: "Possible fix for binoc perma zoom" \ No newline at end of file From c8acbd402c99a737364f14839942f2707747238d Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Wed, 23 Aug 2023 20:51:47 +0100 Subject: [PATCH 12/68] ASO/QM Database access (#4230) # About the pull request Takes database access from the QM and gives it to the ASO. (Ability to modify IDs) # Explain why it's good for the game Oversight that ASO can't modify IDs. Removing from QM as due to place in command inheritance they shouldn't keep it as those above don't have it. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Gave the ASO ability to modify IDs. del: Removed this from the QM. /:cl: --- code/modules/gear_presets/uscm_ship.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 578114222c01..f3129acb23d2 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -320,7 +320,6 @@ ACCESS_MARINE_CARGO, ACCESS_MARINE_RO, ACCESS_MARINE_COMMAND, - ACCESS_MARINE_DATABASE, ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, @@ -637,6 +636,7 @@ . = ..() access = list( ACCESS_MARINE_SENIOR, + ACCESS_MARINE_DATABASE, ACCESS_MARINE_ASO, ACCESS_MARINE_COMMAND, ACCESS_MARINE_BRIG, From 54e37b4cd2bcde8bc66a091bcb1059cb21c2c11b Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 23 Aug 2023 21:13:50 +0100 Subject: [PATCH 13/68] Automatic changelog for PR #4230 [ci skip] --- html/changelogs/AutoChangeLog-pr-4230.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4230.yml diff --git a/html/changelogs/AutoChangeLog-pr-4230.yml b/html/changelogs/AutoChangeLog-pr-4230.yml new file mode 100644 index 000000000000..19a217900892 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4230.yml @@ -0,0 +1,5 @@ +author: "realforest2001" +delete-after: True +changes: + - rscadd: "Gave the ASO ability to modify IDs." + - rscdel: "Removed this from the QM." \ No newline at end of file From 2b6f5fefbaa429b751e29461881bbaa02c350e9b Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Wed, 23 Aug 2023 16:46:46 -0400 Subject: [PATCH 14/68] M4RA damage buff (#4233) # About the pull request Yup. It's a damage buff. Damage multiplier up 10% # Explain why it's good for the game The firerate slowdown has hit the M4RA particularly hard. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Morrow balance: M4RA damage buffed by 10% /:cl: --- code/modules/projectiles/guns/rifles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 38649ff73ca1..70c1709e9e67 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1542,7 +1542,7 @@ set_burst_amount(0) accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5 accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_4 - damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_6 + damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_8 recoil_unwielded = RECOIL_AMOUNT_TIER_4 damage_falloff_mult = 0 scatter = SCATTER_AMOUNT_TIER_8 From 14815f9c261b6a376166033fa3a2790d1d4499aa Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Wed, 23 Aug 2023 21:55:33 +0100 Subject: [PATCH 15/68] Automatic changelog for PR #4233 [ci skip] --- html/changelogs/AutoChangeLog-pr-4233.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4233.yml diff --git a/html/changelogs/AutoChangeLog-pr-4233.yml b/html/changelogs/AutoChangeLog-pr-4233.yml new file mode 100644 index 000000000000..1429fe2cbdc4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4233.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - balance: "M4RA damage buffed by 10%" \ No newline at end of file From c8cb363b381ac6eed98b1409165b2f6ce842ac82 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 24 Aug 2023 01:04:41 +0000 Subject: [PATCH 16/68] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4003.yml | 11 ----------- html/changelogs/AutoChangeLog-pr-4176.yml | 4 ---- html/changelogs/AutoChangeLog-pr-4230.yml | 5 ----- html/changelogs/AutoChangeLog-pr-4233.yml | 4 ---- html/changelogs/archive/2023-08.yml | 19 +++++++++++++++++++ 5 files changed, 19 insertions(+), 24 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4003.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4176.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4230.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4233.yml diff --git a/html/changelogs/AutoChangeLog-pr-4003.yml b/html/changelogs/AutoChangeLog-pr-4003.yml deleted file mode 100644 index 3adbfb8f0eb0..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4003.yml +++ /dev/null @@ -1,11 +0,0 @@ -author: "Zonespace27" -delete-after: True -changes: - - balance: "The M41A, M41Amk1, m39, m46c (iff off), mar-30/40/60, type 71, laser uzi, and every SMG now has automatic fire. To compensate for the ability to re-aim (unlike burst), the guns fire 20% slower while automatic. This does not apply to already-existing automatic weaponry." - - balance: "The HPR can now fire in full auto when bipodded." - - bugfix: "Adding/removing attachments now keeps the current firemode, if possible." - - bugfix: "The dualtube and spec sniper now can switch tubes/toggle laser again" - - bugfix: "Fixed a long-standing exploit with bipods and scopes." - - bugfix: "Fixed guns jamming when shooting UI elements." - - bugfix: "Fixed a bunch of guns unintentionally having burst." - - balance: "You can transfer ammo between HPR ammo boxes by hitting one with another." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4176.yml b/html/changelogs/AutoChangeLog-pr-4176.yml deleted file mode 100644 index 80308102ce82..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4176.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Morrow" -delete-after: True -changes: - - bugfix: "Possible fix for binoc perma zoom" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4230.yml b/html/changelogs/AutoChangeLog-pr-4230.yml deleted file mode 100644 index 19a217900892..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4230.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "realforest2001" -delete-after: True -changes: - - rscadd: "Gave the ASO ability to modify IDs." - - rscdel: "Removed this from the QM." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4233.yml b/html/changelogs/AutoChangeLog-pr-4233.yml deleted file mode 100644 index 1429fe2cbdc4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4233.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Morrow" -delete-after: True -changes: - - balance: "M4RA damage buffed by 10%" \ No newline at end of file diff --git a/html/changelogs/archive/2023-08.yml b/html/changelogs/archive/2023-08.yml index 03bfd03efef5..92158fdf3668 100644 --- a/html/changelogs/archive/2023-08.yml +++ b/html/changelogs/archive/2023-08.yml @@ -320,3 +320,22 @@ doors. - maptweak: Changed a couple walls around research from standard to reinforced, to fit with the containment breach shutters. +2023-08-24: + Morrow: + - bugfix: Possible fix for binoc perma zoom + - balance: M4RA damage buffed by 10% + Zonespace27: + - balance: The M41A, M41Amk1, m39, m46c (iff off), mar-30/40/60, type 71, laser + uzi, and every SMG now has automatic fire. To compensate for the ability to + re-aim (unlike burst), the guns fire 20% slower while automatic. This does not + apply to already-existing automatic weaponry. + - balance: The HPR can now fire in full auto when bipodded. + - bugfix: Adding/removing attachments now keeps the current firemode, if possible. + - bugfix: The dualtube and spec sniper now can switch tubes/toggle laser again + - bugfix: Fixed a long-standing exploit with bipods and scopes. + - bugfix: Fixed guns jamming when shooting UI elements. + - bugfix: Fixed a bunch of guns unintentionally having burst. + - balance: You can transfer ammo between HPR ammo boxes by hitting one with another. + realforest2001: + - rscadd: Gave the ASO ability to modify IDs. + - rscdel: Removed this from the QM. From fe1cd9a5faab8e82e284c2d896e3b37a71001a55 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Thu, 24 Aug 2023 10:12:02 +0100 Subject: [PATCH 17/68] Research Biohazard Lockdown (#4067) # About the pull request Adds a unique lockdown system for research biohazards. # Explain why it's good for the game Adds some nice flavour to research. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Added a new lockdown system to research. add: Added an admin button to interact with above. /:cl: --------- Co-authored-by: harryob --- code/__DEFINES/dcs/signals/signals_global.dm | 4 + code/game/machinery/biohazard_lockdown.dm | 109 ++++++++ code/modules/admin/admin_verbs.dm | 3 +- code/modules/admin/verbs/adminpanelgq.dm | 36 +-- colonialmarines.dme | 1 + .../structures/doors/blastdoors_shutters.dmi | Bin 6216 -> 7754 bytes maps/map_files/USS_Almayer/USS_Almayer.dmm | 242 ++++++------------ sound/effects/biohazard.ogg | Bin 0 -> 86483 bytes 8 files changed, 216 insertions(+), 179 deletions(-) create mode 100644 code/game/machinery/biohazard_lockdown.dm create mode 100644 sound/effects/biohazard.ogg diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm index a288ac2c8be7..e33a75aee132 100644 --- a/code/__DEFINES/dcs/signals/signals_global.dm +++ b/code/__DEFINES/dcs/signals/signals_global.dm @@ -59,3 +59,7 @@ /// From #define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "yautja_armory_opened" + +/// From /proc/biohazard_lockdown() +#define COMSIG_GLOB_RESEARCH_LOCKDOWN "research_lockdown_closed" +#define COMSIG_GLOB_RESEARCH_LIFT "research_lockdown_opened" diff --git a/code/game/machinery/biohazard_lockdown.dm b/code/game/machinery/biohazard_lockdown.dm new file mode 100644 index 000000000000..fd6205baa1d9 --- /dev/null +++ b/code/game/machinery/biohazard_lockdown.dm @@ -0,0 +1,109 @@ +#define LOCKDOWN_READY 0 +#define LOCKDOWN_ACTIVE 1 +GLOBAL_VAR_INIT(lockdown_state, LOCKDOWN_READY) + +/obj/structure/machinery/biohazard_lockdown + name = "Emergency Containment Breach" + icon_state = "big_red_button_tablev" + unslashable = TRUE + unacidable = TRUE + COOLDOWN_DECLARE(containment_lockdown) + +/obj/structure/machinery/biohazard_lockdown/ex_act(severity) + return FALSE + +/obj/structure/machinery/biohazard_lockdown/attack_remote(mob/user as mob) + return FALSE + +/obj/structure/machinery/biohazard_lockdown/attack_alien(mob/user as mob) + return FALSE + +/obj/structure/machinery/biohazard_lockdown/attackby(obj/item/attacking_item, mob/user) + return attack_hand(user) + +/obj/structure/machinery/biohazard_lockdown/attack_hand(mob/living/user) + if(isxeno(user)) + return FALSE + if(!allowed(user)) + to_chat(user, SPAN_DANGER("Access Denied")) + flick(initial(icon_state) + "-denied", src) + return FALSE + + if(!COOLDOWN_FINISHED(src, containment_lockdown)) + to_chat(user, SPAN_BOLDWARNING("Biohazard Lockdown procedures are on cooldown! They will be ready in [COOLDOWN_SECONDSLEFT(src, containment_lockdown)] seconds!")) + return FALSE + + add_fingerprint(user) + biohazard_lockdown(user) + COOLDOWN_START(src, containment_lockdown, 5 MINUTES) + +/obj/structure/machinery/door/poddoor/almayer/biohazard + name = "Biohazard Containment Airlock" + density = FALSE + +/obj/structure/machinery/door/poddoor/almayer/biohazard/Initialize() + . = ..() + RegisterSignal(SSdcs, COMSIG_GLOB_RESEARCH_LOCKDOWN, PROC_REF(close)) + RegisterSignal(SSdcs, COMSIG_GLOB_RESEARCH_LIFT, PROC_REF(open)) + +/obj/structure/machinery/door/poddoor/almayer/biohazard/white + icon_state = "w_almayer_pdoor1" + base_icon_state = "w_almayer_pdoor" + +/client/proc/admin_biohazard_alert() + set name = "Containment Breach Alert" + set category = "Admin.Ship" + + if(!admin_holder ||!check_rights(R_EVENT)) + return FALSE + + var/prompt = tgui_alert(src, "Are you sure you want to trigger a containment breach alert? This will force red alert, and lockdown research.", "Choose.", list("Yes", "No"), 20 SECONDS) + if(prompt != "Yes") + return FALSE + + prompt = tgui_alert(src, "Do you want to use a custom announcement?", "Choose.", list("Yes", "No"), 20 SECONDS) + if(prompt == "Yes") + var/whattoannounce = tgui_input_text(src, "Please enter announcement text.", "what?") + biohazard_lockdown(usr, whattoannounce, TRUE) + else + biohazard_lockdown(usr, admin = TRUE) + return TRUE + +/proc/biohazard_lockdown(mob/user, message, admin = FALSE) + if(IsAdminAdvancedProcCall()) + return PROC_BLOCKED + + var/log = "[key_name(user)] triggered research bio lockdown!" + var/ares_log = "[user.name] triggered Medical Research Biohazard Containment Lockdown." + if(!message) + message = "ATTENTION! \n\nBIOHAZARD CONTAINMENT BREACH. \n\nRESEARCH DEPARTMENT UNDER LOCKDOWN." + else + log = "[key_name(user)] triggered research bio lockdown! (Using a custom announcement)." + if(admin) + log += " (Admin Triggered)." + ares_log = "[MAIN_AI_SYSTEM] triggered Medical Research Biohazard Containment Lockdown." + + switch(GLOB.lockdown_state) + if(LOCKDOWN_READY) + GLOB.lockdown_state = LOCKDOWN_ACTIVE + set_security_level(SEC_LEVEL_RED, TRUE, FALSE) + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_RESEARCH_LOCKDOWN) + if(LOCKDOWN_ACTIVE) + GLOB.lockdown_state = LOCKDOWN_READY + message = "ATTENTION! \n\nBIOHAZARD CONTAINMENT LOCKDOWN LIFTED." + log = "[key_name(user)] lifted research bio lockdown!" + ares_log = "[user.name] lifted Medical Research Biohazard Containment Lockdown." + if(admin) + log += " (Admin Triggered)." + ares_log = "[MAIN_AI_SYSTEM] lifted Medical Research Biohazard Containment Lockdown." + + set_security_level(SEC_LEVEL_BLUE, TRUE, FALSE) + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_RESEARCH_LIFT) + + shipwide_ai_announcement(message, MAIN_AI_SYSTEM, 'sound/effects/biohazard.ogg') + message_admins(log) + var/datum/ares_link/link = GLOB.ares_link + link.log_ares_security("Containment Lockdown", ares_log) + +#undef LOCKDOWN_READY +#undef LOCKDOWN_ACTIVE diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 368e2766ccfc..5e527e6a5442 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -133,7 +133,8 @@ var/list/admin_verbs_minor_event = list( /client/proc/toggle_shipside_sd, /client/proc/shakeshipverb, /client/proc/adminpanelweapons, - /client/proc/adminpanelgq, + /client/proc/admin_general_quarters, + /client/proc/admin_biohazard_alert, /client/proc/toggle_hardcore_perma ) diff --git a/code/modules/admin/verbs/adminpanelgq.dm b/code/modules/admin/verbs/adminpanelgq.dm index 13b6e329aa69..8ef1ed869661 100644 --- a/code/modules/admin/verbs/adminpanelgq.dm +++ b/code/modules/admin/verbs/adminpanelgq.dm @@ -1,22 +1,24 @@ -/client/proc/adminpanelgq() +/client/proc/admin_general_quarters() set name = "Call General Quarters" set category = "Admin.Ship" if(security_level == SEC_LEVEL_RED || security_level == SEC_LEVEL_DELTA) tgui_alert(src, "Security is already red or above, General Quarters cannot be called.", "Acknowledge!", list("ok."), 10 SECONDS) - else - var/whattoannounce = "ATTENTION! GENERAL QUARTERS. ALL HANDS, MAN YOUR BATTLESTATIONS." - var/prompt = tgui_alert(src, "Do you want to leave the announcement as the default one?", "Choose.", list("Yes", "No"), 20 SECONDS) - if(prompt == "No") - whattoannounce = tgui_input_text(src, "Please enter announcement text.", "what?") - prompt = tgui_alert(src, "Are you sure you want to send General Quarters? This will force red alert.", "Choose.", list("Yes", "No"), 20 SECONDS) - if(prompt == "Yes") - set_security_level(2, no_sound=1, announce=0) - shipwide_ai_announcement(whattoannounce, MAIN_AI_SYSTEM, 'sound/effects/GQfullcall.ogg') - message_admins("[key_name_admin(src)] Sent General Quarters with a custom announcement!") - else - prompt = tgui_alert(src, "Are you sure you want to send General Quarters? This will force red alert.", "Choose.", list("Yes", "No"), 20 SECONDS) - if(prompt == "Yes") - set_security_level(2, no_sound=1, announce=0) - shipwide_ai_announcement(whattoannounce, MAIN_AI_SYSTEM, 'sound/effects/GQfullcall.ogg') - message_admins("[key_name_admin(src)] Sent General Quarters!") + return FALSE + + var/prompt = tgui_alert(src, "Are you sure you want to send General Quarters? This will force red alert.", "Choose.", list("Yes", "No"), 20 SECONDS) + if(prompt != "Yes") + return FALSE + + var/whattoannounce = "ATTENTION! GENERAL QUARTERS. ALL HANDS, MAN YOUR BATTLESTATIONS." + var/log = "[key_name_admin(src)] Sent General Quarters!" + + prompt = tgui_alert(src, "Do you want to use a custom announcement?", "Choose.", list("Yes", "No"), 20 SECONDS) + if(prompt == "Yes") + whattoannounce = tgui_input_text(src, "Please enter announcement text.", "what?") + log = "[key_name_admin(src)] Sent General Quarters! (Using a custom announcement)" + + set_security_level(SEC_LEVEL_RED, TRUE, FALSE) + shipwide_ai_announcement(whattoannounce, MAIN_AI_SYSTEM, 'sound/effects/GQfullcall.ogg') + message_admins(log) + return TRUE diff --git a/colonialmarines.dme b/colonialmarines.dme index 42e7880bd313..43a250b7b091 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -741,6 +741,7 @@ #include "code\game\machinery\autolathe_datums.dm" #include "code\game\machinery\Beacon.dm" #include "code\game\machinery\bio-dome_floodlights.dm" +#include "code\game\machinery\biohazard_lockdown.dm" #include "code\game\machinery\bioprinter.dm" #include "code\game\machinery\buttons.dm" #include "code\game\machinery\cell_charger.dm" diff --git a/icons/obj/structures/doors/blastdoors_shutters.dmi b/icons/obj/structures/doors/blastdoors_shutters.dmi index 0c91c00f0f79422f45dbef1f653c8a3e162a2dd6..c5ec97be49b8ffebd7a4ac69e0cda89664ebf6bd 100644 GIT binary patch literal 7754 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 literal 6216 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
    8kgzCt;zh&nI-6nd>=R#=-PpQs=FYhS|h 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