From 827ce3e53f4cf33f90b81f8387cf6079ca92ef45 Mon Sep 17 00:00:00 2001 From: forest2001 <41653574+realforest2001@users.noreply.github.com> Date: Thu, 18 Jul 2024 08:53:44 +0100 Subject: [PATCH 01/16] Splits the civ-only combat reporter gear into their own category. (#6676) # About the pull request Title # Explain why it's good for the game We get a lot of ahelps from first-time players of the combat correspondant role, asking why they can't get these equipment pieces. This should make it clearer. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: The Combat Correspondant's civilian equipment is now in it's own category to make it easier to tell why you can't click it as the military version. /:cl: --- .../vending/vendor_types/crew/combat_correspondent.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm b/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm index b0894ca2a5a2..81bee126dbc8 100644 --- a/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm +++ b/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm @@ -3,9 +3,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_combat_correspondent, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Essential Reporter's Set", 0, /obj/effect/essentials_set/cc, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + + list("CIVILIAN EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Portable Press Fax Machine", 0, /obj/item/device/fax_backpack, CIVILIAN_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), list("Press Broadcasting Camera", 0, /obj/item/device/camera/broadcasting, CIVILIAN_CAN_BUY_UTILITY, VENDOR_ITEM_RECOMMENDED), - list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("UNIFORM (CHOOSE 1)", 0, null, null, null), list("Black Uniform", 0, /obj/item/clothing/under/marine/reporter/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), From afa6a17a9daa85b410b70432080f850ed49b5276 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 18 Jul 2024 08:58:50 +0100 Subject: [PATCH 02/16] Automatic changelog for PR #6676 [ci skip] --- html/changelogs/AutoChangeLog-pr-6676.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6676.yml diff --git a/html/changelogs/AutoChangeLog-pr-6676.yml b/html/changelogs/AutoChangeLog-pr-6676.yml new file mode 100644 index 000000000000..d59200a1b1c1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6676.yml @@ -0,0 +1,4 @@ +author: "realforest2001" +delete-after: True +changes: + - rscadd: "The Combat Correspondant's civilian equipment is now in it's own category to make it easier to tell why you can't click it as the military version." \ No newline at end of file From d1d4926f3ff744431353e9efe0b48ecf284e356b Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Thu, 18 Jul 2024 12:47:55 +0200 Subject: [PATCH 03/16] Malf suits closet and jetpack removal (#6729) # About the pull request never used nowhere cut it cut it # Explain why it's good for the game less mess in files # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: del: Removed malfanction closet /:cl: --------- Co-authored-by: vincibrv --- code/game/objects/items/tanks/jetpack.dm | 85 ------------------- .../crates_lockers/closets/malfunction.dm | 16 ---- code/modules/gear_presets/other.dm | 23 ----- .../mob/living/carbon/human/human_movement.dm | 6 -- colonialmarines.dme | 2 - .../FOP_v3_Sciannex/Fiorina_SciAnnex.dmm | 1 - 6 files changed, 133 deletions(-) delete mode 100644 code/game/objects/items/tanks/jetpack.dm delete mode 100644 code/game/objects/structures/crates_lockers/closets/malfunction.dm diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm deleted file mode 100644 index 3a5afef6cf1e..000000000000 --- a/code/game/objects/items/tanks/jetpack.dm +++ /dev/null @@ -1,85 +0,0 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 - -/obj/item/tank/jetpack - name = "Jetpack (Empty)" - desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution." - icon_state = "jetpack" - w_class = SIZE_LARGE - item_state = "jetpack" - distribute_pressure = ONE_ATMOSPHERE*O2STANDARD - var/datum/effect_system/ion_trail_follow/ion_trail - var/on = 0 - var/stabilization_on = 0 - var/volume_rate = 500 //Needed for borg jetpack transfer - actions_types = list(/datum/action/item_action) - -/obj/item/tank/jetpack/Initialize() - . = ..() - src.ion_trail = new /datum/effect_system/ion_trail_follow() - src.ion_trail.set_up(src) - -/obj/item/tank/jetpack/Destroy() - QDEL_NULL(ion_trail) - return ..() - - -/obj/item/tank/jetpack/verb/toggle_rockets() - set name = "Toggle Jetpack Stabilization" - set category = "Object" - set src in usr - src.stabilization_on = !( src.stabilization_on ) - to_chat(usr, "You toggle the stabilization [stabilization_on? "on":"off"].") - -/obj/item/tank/jetpack/verb/toggle() - set name = "Toggle Jetpack" - set category = "Object" - set src in usr - on = !on - if(on) - icon_state = "[icon_state]-on" - ion_trail.start() - else - icon_state = initial(icon_state) - ion_trail.stop() - - if (ismob(usr)) - var/mob/M = usr - M.update_inv_back() - - for(var/X in actions) - var/datum/action/A = X - A.update_button_icon() - -/obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user) - if(!(src.on)) - return 0 - - if(pressure > 5) - return 1 - else - ion_trail.stop() - return 0 - - -/obj/item/tank/jetpack/ui_action_click() - toggle() - - -/obj/item/tank/jetpack/void - name = "Void Jetpack (Oxygen)" - desc = "It works well in a void." - icon_state = "jetpack-void" - item_state = "jetpack-void" - -/obj/item/tank/jetpack/oxygen - name = "Jetpack (Oxygen)" - desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution." - icon_state = "jetpack" - item_state = "jetpack" - -/obj/item/tank/jetpack/carbondioxide - name = "Jetpack (Carbon Dioxide)" - desc = "A tank of compressed carbon dioxide for use as propulsion in zero-gravity areas. Painted black to indicate that it should not be used as a source for internals." - distribute_pressure = 0 - icon_state = "jetpack-black" - item_state = "jetpack-black" diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm deleted file mode 100644 index 704e2c79157a..000000000000 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ /dev/null @@ -1,16 +0,0 @@ - -/obj/structure/closet/malf/suits - desc = "It's a storage unit for operational gear." - icon_state = "syndicate" - icon_closed = "syndicate" - icon_opened = "syndicate_open" - -/obj/structure/closet/malf/suits/Initialize() - . = ..() - new /obj/item/tank/jetpack/void(src) - new /obj/item/clothing/mask/breath(src) - new /obj/item/clothing/head/helmet/space/uscm(src) - new /obj/item/clothing/suit/space/uscm(src) - new /obj/item/tool/crowbar(src) - new /obj/item/cell(src) - new /obj/item/device/multitool(src) diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index 9ea05749fe0d..4d7ef9bda559 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -504,29 +504,6 @@ new_human.equip_if_possible(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES) new_human.equip_if_possible(new /obj/item/clipboard, WEAR_WAIST) -//*****************************************************************************************************/ - -/datum/equipment_preset/other/compression_suit - name = "Mk50 Compression Suit" - flags = EQUIPMENT_PRESET_EXTRA - faction = FACTION_PMC - skills = /datum/skills/pfc - idtype = /obj/item/card/id/data - -/datum/equipment_preset/other/compression_suit/load_gear(mob/living/carbon/human/new_human) - //TODO: add backpacks and satchels - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots, WEAR_FEET) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/space/compression, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/compression, WEAR_HEAD) - var /obj/item/tank/jetpack/J = new /obj/item/tank/jetpack/oxygen(new_human) - new_human.equip_to_slot_or_del(J, WEAR_BACK) - J.toggle() - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/breath, WEAR_FACE) - J.Topic(null, list("stat" = 1)) - spawn_merc_weapon(new_human) - //*****************************************************************************************************/ diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 7cb2d04e67de..c9a36d283794 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -105,12 +105,6 @@ //Can we act if(is_mob_restrained()) return 0 - //Do we have a working jetpack - if(istype(back, /obj/item/tank/jetpack)) - var/obj/item/tank/jetpack/J = back - if(((!check_drift) || (check_drift && J.stabilization_on)) && (body_position == STANDING_UP) && (J.allow_thrust(0.01, src))) - inertia_dir = 0 - return 1 // if(!check_drift && J.allow_thrust(0.01, src)) // return 1 diff --git a/colonialmarines.dme b/colonialmarines.dme index daafb41694f7..2f66c2c0f929 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1248,7 +1248,6 @@ #include "code\game\objects\items\storage\toolbox.dm" #include "code\game\objects\items\storage\toolkit.dm" #include "code\game\objects\items\storage\wallets.dm" -#include "code\game\objects\items\tanks\jetpack.dm" #include "code\game\objects\items\tanks\tank_types.dm" #include "code\game\objects\items\tanks\tanks.dm" #include "code\game\objects\items\tools\cleaning_tools.dm" @@ -1345,7 +1344,6 @@ #include "code\game\objects\structures\crates_lockers\closets\gimmick.dm" #include "code\game\objects\structures\crates_lockers\closets\job_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\l3closet.dm" -#include "code\game\objects\structures\crates_lockers\closets\malfunction.dm" #include "code\game\objects\structures\crates_lockers\closets\utility_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\wall_locker.dm" #include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm" diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index f66743b6388e..954a9fdbe40a 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -25377,7 +25377,6 @@ /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) "tpE" = ( -/obj/item/tank/jetpack/carbondioxide, /obj/structure/surface/rack, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) From ccdd8e6413eb514a606fbbb42b79fef700f5635e Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 18 Jul 2024 11:57:09 +0100 Subject: [PATCH 04/16] Automatic changelog for PR #6729 [ci skip] --- html/changelogs/AutoChangeLog-pr-6729.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6729.yml diff --git a/html/changelogs/AutoChangeLog-pr-6729.yml b/html/changelogs/AutoChangeLog-pr-6729.yml new file mode 100644 index 000000000000..430b4216cbeb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6729.yml @@ -0,0 +1,4 @@ +author: "cuberound" +delete-after: True +changes: + - rscdel: "Removed malfanction closet" \ No newline at end of file From 427a29db3933a5841d5c7555de269d75fc9e5251 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:30:36 -0700 Subject: [PATCH 05/16] Fix light blue scrub cost in snowflake vendor (#6717) # About the pull request This PR is a follow up to #5642 which had this as a free item when it should have been the same as any other item in the vendor. # Explain why it's good for the game No infinite scrubs I guess. # Testing Photographs and Procedure
Screenshots & Videos ![image](https://github.com/user-attachments/assets/24a8a847-6b48-4b20-89dd-2ee3991f42b9)
# Changelog :cl: Drathek fix: Fixed light blue scrubs having no cost in snowflake vendor. /:cl: --- code/game/machinery/vending/vendor_types/crew/synthetic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 3f8eff44d052..9ce15535e2da 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("USCM UNIFORMS", 0, null, null, null), list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/rank/medical/blue, null, VENDOR_ITEM_REGULAR), - list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR), + list("Medical Scrubs, Light Blue", 12, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR), list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR), list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR), list("Medical Scrubs, Olive", 12, /obj/item/clothing/under/rank/medical/olive, null, VENDOR_ITEM_REGULAR), From 7afdf89e6ae55c7872723417410edae83d086fd9 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:36:18 +0100 Subject: [PATCH 06/16] Automatic changelog for PR #6717 [ci skip] --- html/changelogs/AutoChangeLog-pr-6717.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6717.yml diff --git a/html/changelogs/AutoChangeLog-pr-6717.yml b/html/changelogs/AutoChangeLog-pr-6717.yml new file mode 100644 index 000000000000..f3de8366b87e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6717.yml @@ -0,0 +1,4 @@ +author: "Drathek" +delete-after: True +changes: + - bugfix: "Fixed light blue scrubs having no cost in snowflake vendor." \ No newline at end of file From 0f92deb4ef2c6ac1772b9c739188aa975eaeed84 Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Thu, 18 Jul 2024 19:32:14 +0200 Subject: [PATCH 07/16] Wheelchair broken hand move delay standardazation (#6720) # About the pull request having right hand broken added more slowdown to wheelchair then left one, gets both the same # Explain why it's good for the game oversight fix # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: having left hand broken and not splinted has the same effect on wheelchair movement speed as right hand /:cl: --------- Co-authored-by: vincibrv --- .../objects/structures/stool_bed_chair_nest/wheelchair.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 986ae99739aa..f71882374518 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -36,12 +36,12 @@ move_delay += 4 //harder to move a wheelchair with a single hand working_hands-- else if((left_hand.status & LIMB_BROKEN) && !(left_hand.status & LIMB_SPLINTED)) - move_delay++ + move_delay ++ if(!right_hand || (right_hand.status & LIMB_DESTROYED)) move_delay += 4 working_hands-- else if((right_hand.status & LIMB_BROKEN) && !(right_hand.status & LIMB_SPLINTED)) - move_delay += 2 + move_delay++ if(!working_hands) return // No hands to drive your chair? Tough luck! if(driver.pulling && driver.pulling.drag_delay && driver.get_pull_miltiplier()) //Dragging stuff can slow you down a bit. From c28bb6d090f4965cfc774ad56488bedbdf2f270e Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:43:52 +0100 Subject: [PATCH 08/16] Automatic changelog for PR #6720 [ci skip] --- html/changelogs/AutoChangeLog-pr-6720.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6720.yml diff --git a/html/changelogs/AutoChangeLog-pr-6720.yml b/html/changelogs/AutoChangeLog-pr-6720.yml new file mode 100644 index 000000000000..d56c3a66dbb3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6720.yml @@ -0,0 +1,4 @@ +author: "cuberound" +delete-after: True +changes: + - bugfix: "having left hand broken and not splinted has the same effect on wheelchair movement speed as right hand" \ No newline at end of file From 0456166953d7fe0064d6bba2f9b319cb24a8c19a Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Thu, 18 Jul 2024 21:17:44 +0200 Subject: [PATCH 09/16] Holo-round runtime fix (#6738) # About the pull request fixes incorrect alpha on holorounds # Explain why it's good for the game fix of runtime # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: corrects holoround highligh alpha value /:cl: --------- Co-authored-by: vincibrv --- code/datums/components/bonus_damage_stack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/bonus_damage_stack.dm b/code/datums/components/bonus_damage_stack.dm index 78da5e036ce4..7a9bf5aa9560 100644 --- a/code/datums/components/bonus_damage_stack.dm +++ b/code/datums/components/bonus_damage_stack.dm @@ -60,7 +60,7 @@ var/color = COLOR_BONUS_DAMAGE var/intensity = bonus_damage_stacks / (initial(bonus_damage_cap) * 2) // if intensity is too high of a value, the hex code will become invalid - color += num2text(BONUS_DAMAGE_MAX_ALPHA * clamp(intensity, 0, 0.5), 1, 16) + color += num2text(BONUS_DAMAGE_MAX_ALPHA * clamp(intensity, 0, 0.5), 2, 16) if(parent) var/atom/A = parent A.add_filter("bonus_damage_stacks", 2, list("type" = "outline", "color" = color, "size" = 1 + clamp(intensity, 0, 1))) From 26918e56a2ca9521e4af888338f693701eb4e786 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:24:43 +0100 Subject: [PATCH 10/16] Automatic changelog for PR #6738 [ci skip] --- html/changelogs/AutoChangeLog-pr-6738.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6738.yml diff --git a/html/changelogs/AutoChangeLog-pr-6738.yml b/html/changelogs/AutoChangeLog-pr-6738.yml new file mode 100644 index 000000000000..157e32519845 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6738.yml @@ -0,0 +1,4 @@ +author: "cuberound" +delete-after: True +changes: + - bugfix: "corrects holoround highligh alpha value" \ No newline at end of file From 161035a5be6d495b553874faedf6703446fae6b7 Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Thu, 18 Jul 2024 21:18:02 +0200 Subject: [PATCH 11/16] Planted flag bugfix and warcry removal (#6737) # About the pull request - Fixes the flag being able to be duplicated - The flag does a small amount of damage when hitting someone - Item flag is indestructable - Removes forced warcries # Explain why it's good for the game - Bugs are bad etc. etc. - You are hitting someone with a big flagpole, it's fair that it does a bit of damage. - Stops the flag from getting annihilated by a stray nade or etc - I talked with another maintainer about this, and I was given some fair arguments about why forcing emotes is bad. In summary, on an RP server, the player in charge of a character should ideally have as much control over what the character does as possible. While this isn't the case for things like brain damage causing forced movement, those are consequences of negative things occurring to a character that serves as a hindrance to being able to play. As such, you should try to minimize the amount of times that forced emotes occur when not as a punishment, such as here. - What hasn't changed: - The flag planter still warcries - Having >= 14 people still makes a custom warcry sound for the flag planter. # Testing Photographs and Procedure
Screenshots & Videos ![image](https://github.com/user-attachments/assets/953b435f-05ac-438f-97f2-1fec511e1051)
# Changelog :cl: Zonespace, Vile Beggar add: Handheld planted flags are now indestructible and do a small amount of damage on hit. fix: Plantable flags can no longer be duplicated. del: Planting a UA flag no longer forces anyone but the planter to warcry. /:cl: --------- Co-authored-by: John Doe --- code/game/objects/items/stacks/flags.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/stacks/flags.dm b/code/game/objects/items/stacks/flags.dm index e032e2c80157..14833812b06c 100644 --- a/code/game/objects/items/stacks/flags.dm +++ b/code/game/objects/items/stacks/flags.dm @@ -106,7 +106,7 @@ user.visible_message(SPAN_NOTICE("[user] starts taking [src] down..."), SPAN_NOTICE("You start taking [src] down...")) playsound(loc, 'sound/effects/flag_raising.ogg', 30) - if(!do_after(user, 6 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC)) + if(!do_after(user, 6 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC) || QDELETED(src)) return playsound(loc, 'sound/effects/flag_raised.ogg', 30) @@ -170,7 +170,11 @@ icon = 'icons/obj/structures/plantable_flag.dmi' inhand_x_dimension = 64 inhand_y_dimension = 64 + force = 15 + throwforce = 5 + hitsound = "swing_hit" unacidable = TRUE + indestructible = TRUE item_icons = list( WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_64.dmi', WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_64.dmi' @@ -233,12 +237,10 @@ if(play_warcry && user.faction == faction && user.a_intent == INTENT_HARM) var/allies_nearby = 0 if(COOLDOWN_FINISHED(src, warcry_cooldown_item)) - for (var/mob/living/carbon/human in orange(planted_flag, 7)) - if (human.is_dead() || human.faction != faction) + for(var/mob/living/carbon/human in orange(planted_flag, 7)) + if(human.is_dead() || human.faction != faction) continue allies_nearby++ - if (prob(40) && human != user) - human.emote("warcry") user.show_speech_bubble("warcry") if(allies_nearby >= allies_required) From 61245b778274e32828361aab98461973eeb968c6 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:34:57 +0100 Subject: [PATCH 12/16] Automatic changelog for PR #6737 [ci skip] --- html/changelogs/AutoChangeLog-pr-6737.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6737.yml diff --git a/html/changelogs/AutoChangeLog-pr-6737.yml b/html/changelogs/AutoChangeLog-pr-6737.yml new file mode 100644 index 000000000000..9821c7ad5757 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6737.yml @@ -0,0 +1,6 @@ +author: "Zonespace, Vile Beggar" +delete-after: True +changes: + - rscadd: "Handheld planted flags are now indestructible and do a small amount of damage on hit." + - bugfix: "Plantable flags can no longer be duplicated." + - rscdel: "Planting a UA flag no longer forces anyone but the planter to warcry." \ No newline at end of file From 4b88f60863ab1cf5c403fb3accff50370c75e70d Mon Sep 17 00:00:00 2001 From: kiVts <48099872+kiVts@users.noreply.github.com> Date: Thu, 18 Jul 2024 15:23:25 -0400 Subject: [PATCH 13/16] Sound range (#6745) # About the pull request Quadtrees pr did that, soo uhh bbadd?? fixes #6744 fixes #6733 # Explain why it's good for the game deaf marines bad (and xenos is bad) # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: Surgery sound and alike is fixed /:cl: --- code/controllers/subsystem/sound.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/sound.dm b/code/controllers/subsystem/sound.dm index 13dd6a0dddf1..3cc3f0ef8090 100644 --- a/code/controllers/subsystem/sound.dm +++ b/code/controllers/subsystem/sound.dm @@ -19,7 +19,7 @@ SUBSYSTEM_DEF(sound) if(!run_hearers) // Initialize for handling next template run_hearers = run_queue[run_template] // get base hearers if(run_template.range) // ranging - run_hearers |= SSquadtree.players_in_range(SQUARE(run_template.x, run_template.y, run_template.range), run_template.z) + run_hearers |= SSquadtree.players_in_range(SQUARE(run_template.x, run_template.y, run_template.range * 2), run_template.z) if(MC_TICK_CHECK) return while(length(run_hearers)) // Output sound to hearers From 77c7855039e763a7aadb76129dc4ae154df7fcc7 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:48:23 +0100 Subject: [PATCH 14/16] Automatic changelog for PR #6745 [ci skip] --- html/changelogs/AutoChangeLog-pr-6745.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6745.yml diff --git a/html/changelogs/AutoChangeLog-pr-6745.yml b/html/changelogs/AutoChangeLog-pr-6745.yml new file mode 100644 index 000000000000..e19624770261 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6745.yml @@ -0,0 +1,4 @@ +author: "kiVts" +delete-after: True +changes: + - bugfix: "Surgery sound and alike is fixed" \ No newline at end of file From bc26f965d6556de3083c6939b96f1882970b9467 Mon Sep 17 00:00:00 2001 From: Spy <31124786+SpypigDev@users.noreply.github.com> Date: Fri, 19 Jul 2024 05:23:35 +1000 Subject: [PATCH 15/16] SO Armory Vendor Hotfix (#6713) # About the pull request Fixes infinitely vendible knives bug, introduced in #6496 # 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: SO Armory vendors no longer infinitely supply knives /:cl: --- .../machinery/vending/vendor_types/crew/staff_officer_armory.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm index 1e21f2f7256d..46de6ed028d0 100644 --- a/code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm +++ b/code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer_armory, list( list("Marine Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), - list("Bayonet", 0, /obj/item/attachable/bayonet, null, VENDOR_ITEM_REGULAR), + list("Bayonet", 0, /obj/item/attachable/bayonet, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("SPECIALISATION KIT (CHOOSE 1)", 0, null, null, null), list("Essential Engineer Set", 0, /obj/effect/essentials_set/engi, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED), From 852f85cfb28f704d722a627b05175ff82acbd344 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 18 Jul 2024 20:59:32 +0100 Subject: [PATCH 16/16] Automatic changelog for PR #6713 [ci skip] --- html/changelogs/AutoChangeLog-pr-6713.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6713.yml diff --git a/html/changelogs/AutoChangeLog-pr-6713.yml b/html/changelogs/AutoChangeLog-pr-6713.yml new file mode 100644 index 000000000000..f789e67c183f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6713.yml @@ -0,0 +1,4 @@ +author: "SpypigDev" +delete-after: True +changes: + - bugfix: "SO Armory vendors no longer infinitely supply knives" \ No newline at end of file