From 640c76bc1d72372d60f8f9df69815c2f5bca971c Mon Sep 17 00:00:00 2001 From: Odairu <39929315+Odairu@users.noreply.github.com> Date: Sun, 11 Aug 2024 16:38:56 -0400 Subject: [PATCH 1/7] Arrows now properly apply their damage buff when used by ashwalkers and ice cats (#1932) ## About The Pull Request Title ## Why It's Good For The Game closes #1853 ## Proof Of Testing ![image](https://github.com/user-attachments/assets/10909aac-092b-44c8-9385-b60f9fd62ec6) ## Changelog :cl: fix: bows properly apply damage as ashwalker/icecat /:cl: Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> --- modular_zubbers/code/modules/bow_adjustments/arrow.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_zubbers/code/modules/bow_adjustments/arrow.dm b/modular_zubbers/code/modules/bow_adjustments/arrow.dm index 89d01e187263e..86296f5d7f569 100644 --- a/modular_zubbers/code/modules/bow_adjustments/arrow.dm +++ b/modular_zubbers/code/modules/bow_adjustments/arrow.dm @@ -20,12 +20,12 @@ /mob/living/basic/wumborian_fugu, ) -/obj/projectile/bullet/arrow/prehit_pierce(mob/living/target, mob/living/carbon/human/user) - +/obj/projectile/bullet/arrow/prehit_pierce(mob/living/target) + var/mob/living/carbon/human/user = firer if(isnull(target)) return ..() - if(user?.mind?.special_role == ROLE_LAVALAND) + if(istype(user?.mind?.assigned_role, /datum/job/ash_walker) || istype(user?.mind?.assigned_role, /datum/job/primitive_catgirl)) damage += tribal_damage_bonus weak_against_armour = FALSE From 1a82385800da7c1f4cda718690a64006647f724c Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sun, 11 Aug 2024 22:39:20 +0200 Subject: [PATCH 2/7] Automatic changelog for PR #1932 [ci skip] --- html/changelogs/AutoChangeLog-pr-1932.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1932.yml diff --git a/html/changelogs/AutoChangeLog-pr-1932.yml b/html/changelogs/AutoChangeLog-pr-1932.yml new file mode 100644 index 0000000000000..f1cb3787241ac --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1932.yml @@ -0,0 +1,4 @@ +author: "Odairu" +delete-after: True +changes: + - bugfix: "bows properly apply damage as ashwalker/icecat" \ No newline at end of file From 4c537c0ac6b989ee2d7e4e6cb6894a641d9c8398 Mon Sep 17 00:00:00 2001 From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Mon, 12 Aug 2024 01:53:15 -0700 Subject: [PATCH 3/7] Fixes an oversight where looting trash piles had an about 0.005% chance to dust you. (#1937) I refuse to elaborate. --- .../code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm index 3b2ae85c4579c..b065627831845 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_one_of_a_kind.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_INIT(one_of_a_kind_loot, list( /obj/item/clothing/suit/armor/reactive/table, /obj/item/clothing/shoes/jackboots/fast, /obj/item/melee/energy/sword/bananium, - /obj/item/dice/d20/fate/one_use, + /obj/item/dice/d20/teleporting_die_of_fate, /obj/item/modular_computer/pda/clear, /obj/item/gun/energy/meteorgun/pen, /obj/item/hot_potato, @@ -10,4 +10,4 @@ GLOBAL_LIST_INIT(one_of_a_kind_loot, list( /obj/item/spear/grey_tide, /obj/item/shadowcloak, /obj/item/disk/nuclear/fake, -)) \ No newline at end of file +)) From 91a6d6f8c5eb6b16292d829a623a97ed3f4d88b9 Mon Sep 17 00:00:00 2001 From: Return Date: Mon, 12 Aug 2024 04:12:36 -0500 Subject: [PATCH 4/7] Adds anime eyes (#1895) ## About The Pull Request This PR adds anime eyes as markings, so that players can have slightly cooler looking eyes. Original sprites modified from Sojourn Station. Basic ![image](https://github.com/user-attachments/assets/b274e572-945b-48ee-8133-aa1437803cb9) Eyes Inner ![image](https://github.com/user-attachments/assets/fa720737-7c5f-43c4-b901-4380c0fb8ada) Eyes Outer ![image](https://github.com/user-attachments/assets/c249a5ec-ff59-49bc-82cb-103c4c5785b6) Both Eyes Inner and Eyes Outer ![image](https://github.com/user-attachments/assets/61508a90-2720-4481-a585-1f1bfcccd8ab) ## Why It's Good For The Game I can have my eyes visible while wearing a hat :) Akula moment ## Proof Of Testing Trust me bro, it compiles ## Changelog :cl: ReturnToZender (code) add: Anime eye sprites /:cl: --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> --- .../mob/dead/new_player/body_markings.dm | 10 ++++++++++ .../icons/mob/body_markings/markings.dmi | Bin 4087 -> 4197 bytes 2 files changed, 10 insertions(+) diff --git a/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm b/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm index fda9190608323..849185a4870aa 100644 --- a/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm +++ b/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm @@ -38,6 +38,16 @@ icon_state = "deer" affected_bodyparts = HEAD +/datum/body_marking/bubber/anime_inner + name = "Anime Eyes (Inner)" + icon_state = "eyesinner" + affected_bodyparts = HEAD + +/datum/body_marking/bubber/anime_outer + name = "Anime Eyes (Outer)" + icon_state = "eyesouter" + affected_bodyparts = HEAD + /datum/body_marking/bubber/clowncross name = "Clown Cross" icon_state = "clowncross" diff --git a/modular_zubbers/icons/mob/body_markings/markings.dmi b/modular_zubbers/icons/mob/body_markings/markings.dmi index 3c789cc4cd3c2b25e8525b98f5dc88aee751d29e..19f29150ad86e41ec943a46118c1eaf4fc8f34c2 100644 GIT binary patch literal 4197 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 Date: Mon, 12 Aug 2024 11:18:16 +0200 Subject: [PATCH 5/7] Automatic changelog for PR #1895 [ci skip] --- html/changelogs/AutoChangeLog-pr-1895.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1895.yml diff --git a/html/changelogs/AutoChangeLog-pr-1895.yml b/html/changelogs/AutoChangeLog-pr-1895.yml new file mode 100644 index 0000000000000..02184d271122a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1895.yml @@ -0,0 +1,4 @@ +author: "ReturnToZender (code)" +delete-after: True +changes: + - rscadd: "Anime eye sprites" \ No newline at end of file From 420622ef337402d2eb4b5268447f9dd0bcf865cc Mon Sep 17 00:00:00 2001 From: Odairu <39929315+Odairu@users.noreply.github.com> Date: Mon, 12 Aug 2024 05:41:28 -0400 Subject: [PATCH 6/7] [Bounty] Adds sechailer, and fixes the single problem it had (#1912) ## About The Pull Request does as title says ## Why It's Good For The Game was a bounty to finish #1401 ## Proof Of Testing ![image](https://github.com/user-attachments/assets/f51990f0-5078-40e6-958b-433b5497120c) I kept trying to get a video but it kept being too big womp womp, the issue is fixed though ## Changelog :cl: add: Adds sec hailer /:cl: --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: Waterpig --- modular_zubbers/code/game/Items/sec_hailer.dm | 73 +++++++++++++++++++ tgstation.dme | 1 + 2 files changed, 74 insertions(+) create mode 100644 modular_zubbers/code/game/Items/sec_hailer.dm diff --git a/modular_zubbers/code/game/Items/sec_hailer.dm b/modular_zubbers/code/game/Items/sec_hailer.dm new file mode 100644 index 0000000000000..28a7b9ddd7932 --- /dev/null +++ b/modular_zubbers/code/game/Items/sec_hailer.dm @@ -0,0 +1,73 @@ +/obj/item/clothing/mask/gas/sechailer + // Did the hailer get EMP'd? + var/emped = FALSE + var/obj/item/radio/intercom/radio + COOLDOWN_DECLARE(backup_cooldown) + actions_types = list(/datum/action/item_action/backup, /datum/action/item_action/halt, /datum/action/item_action/adjust) + +// Swat Mask too +/obj/item/clothing/mask/gas/sechailer/swat + actions_types = list(/datum/action/item_action/backup, /datum/action/item_action/halt) + +/datum/action/item_action/backup + name = "BACKUP!" + +/// Add the Radio +/obj/item/clothing/mask/gas/sechailer/Initialize(mapload) + . = ..() + AddElement(/datum/element/empprotection, EMP_PROTECT_CONTENTS) + radio = new(src) + radio.set_frequency(FREQ_SECURITY) + radio.set_listening(FALSE, FALSE) + radio.recalculateChannels() + +/obj/item/clothing/mask/gas/sechailer/Destroy() + QDEL_NULL(radio) + . = ..() + +/// If EMP'd, become EMP'd +/obj/item/clothing/mask/gas/sechailer/emp_act(severity) + . = ..() + if(!emped) + balloon_alert_to_viewers("Backup Hailer Malfunctioning!", vision_distance = 1) + emped = TRUE + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/clothing/mask/gas/sechailer, emp_reset)), 2 MINUTES) + +/// Reset EMP after 2 minutes +/obj/item/clothing/mask/gas/sechailer/proc/emp_reset() + SIGNAL_HANDLER + + balloon_alert(src, "Backup Hailer Recalibrated") + emped = FALSE + +/obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, action) + if (istype(action, /datum/action/item_action/backup)) + backup() + else if (istype(action, /datum/action/item_action/halt)) + halt() + else + adjust_visor(user) + +/obj/item/clothing/mask/gas/sechailer/proc/backup() + var/turf/turf_location = get_turf(src) + var/location = get_area_name(turf_location) + + if (!isliving(usr) || !can_use(usr)) + return + if (!COOLDOWN_FINISHED(src, backup_cooldown)) + balloon_alert(usr, "On Cooldown!") + return + if (emped) + balloon_alert(usr, "Backup Malfunctioning!") + return + if (!is_station_level(turf_location.z)) + balloon_alert(usr, "Out of Range!") + return + + COOLDOWN_START(src, backup_cooldown, 1 MINUTES) + radio.talk_into(usr, "Backup Requested in [location]!", RADIO_CHANNEL_SECURITY) + usr.audible_message("BACKUP REQUESTED!") + balloon_alert_to_viewers("Backup Requested!", "Backup Requested!", 7) + log_combat(usr, src, "has called for backup") + playsound(usr, 'sound/misc/whistle.ogg', 50, FALSE, 4) + diff --git a/tgstation.dme b/tgstation.dme index 53b611debea75..8fd0ce94798bb 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8605,6 +8605,7 @@ #include "modular_zubbers\code\game\Items\coins.dm" #include "modular_zubbers\code\game\Items\nerdcrowbar.dm" #include "modular_zubbers\code\game\Items\plushes.dm" +#include "modular_zubbers\code\game\Items\sec_hailer.dm" #include "modular_zubbers\code\game\Items\storage\backpack.dm" #include "modular_zubbers\code\game\Items\storage\medkit.dm" #include "modular_zubbers\code\game\machinery\crew_monitor.dm" From f830d2a502f0f6a1f0b746c89fb7f9337cf1f0a2 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:15:46 +0200 Subject: [PATCH 7/7] Automatic changelog for PR #1912 [ci skip] --- html/changelogs/AutoChangeLog-pr-1912.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1912.yml diff --git a/html/changelogs/AutoChangeLog-pr-1912.yml b/html/changelogs/AutoChangeLog-pr-1912.yml new file mode 100644 index 0000000000000..44e55e70b20e3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1912.yml @@ -0,0 +1,4 @@ +author: "Odairu" +delete-after: True +changes: + - rscadd: "Adds sec hailer" \ No newline at end of file