From 7ff90e0275da9dbf66457100a360bb4b562b938a Mon Sep 17 00:00:00 2001 From: Kuki-kono <106471551+Kuki-kono@users.noreply.github.com> Date: Tue, 26 Sep 2023 00:28:38 +0100 Subject: [PATCH 01/20] Update gladiator.dm --- .../hostile/megafauna/gladiator.dm | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm index 752072b66c..da10952629 100644 --- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm +++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/gladiator.dm @@ -239,27 +239,32 @@ They deal 35 brute (armor is considered). speenturfs.len = temp.len var/woop = FALSE var/start = 0 - for(var/i in 0 to speenrange) - speenturfs[1+i] = locate(x - i, y - speenrange, z) - start = i - for(var/i in 1 to (speenrange*2)) - var/turf/T = speenturfs[start] - speenturfs[start+i] = locate(T.x, T.y + i, T.z) - if(i == (speenrange*2)) - start = (start+i) - for(var/i in 1 to (speenrange*2)) - var/turf/T = speenturfs[start] - speenturfs[start+i] = locate(T.x + i, T.y, T.z) - if(i == (speenrange*2)) - start = (start+i) - for(var/i in 1 to (speenrange*2)) - var/turf/T = speenturfs[start] - speenturfs[start+i] = locate(T.x, T.y - i, T.z) - if(i == (speenrange*2)) - start = (start+i) - for(var/i in 1 to speenrange) - var/turf/T = speenturfs[start] - speenturfs[start+i] = locate(T.x - i, T.y, T.z) + if(speenturfs.len > (start+speenrange)) + for(var/i in 0 to speenrange) + speenturfs[1+i] = locate(x - i, y - speenrange, z) + start = i + if(speenturfs.len > (start+(speenrange*2))) + for(var/i in 1 to (speenrange*2)) + var/turf/T = speenturfs[start] + speenturfs[start+i] = locate(T.x, T.y + i, T.z) + if(i == (speenrange*2)) + start = (start+i) + if(speenturfs.len > (start+(speenrange*2))) + for(var/i in 1 to (speenrange*2)) + var/turf/T = speenturfs[start] + speenturfs[start+i] = locate(T.x + i, T.y, T.z) + if(i == (speenrange*2)) + start = (start+i) + if(speenturfs.len > (start+(speenrange*2))) + for(var/i in 1 to (speenrange*2)) + var/turf/T = speenturfs[start] + speenturfs[start+i] = locate(T.x, T.y - i, T.z) + if(i == (speenrange*2)) + start = (start+i) + if(speenturfs.len > (start+speenrange)) + for(var/i in 1 to speenrange) + var/turf/T = speenturfs[start] + speenturfs[start+i] = locate(T.x - i, T.y, T.z) var/list/hit_things = list() for(var/turf/T in speenturfs) src.dir = get_dir(src, T) From 622b73f02f1464244c78a739396a5b1b93dc3699 Mon Sep 17 00:00:00 2001 From: MysteryMan21333 <51891267+MysteryMan21333@users.noreply.github.com> Date: Sun, 8 Oct 2023 15:58:18 -0500 Subject: [PATCH 02/20] [Mirror] Renames Update_Icons.dm # About The Pull Request Changes all Update_Icons.dm names to their respected pathing groups to help with clarification. ## Why It's Good For The Game I personally think this will help with clarification on which Update_Icons.dm they represent as we have quite a few already. ## A Port? Renames update_icons.dm (#51067) - TG Station ## Pre-Merge Checklist - [ ] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. ## Changelog :cl: code: Small changes to naming. /:cl: --- ...{update_icons.dm => alien_update_icons.dm} | 0 ...date_icons.dm => humanoid_update_icons.dm} | 0 ...{update_icons.dm => larva_update_icons.dm} | 0 ...update_icons.dm => carbon_update_icons.dm} | 0 ...{update_icons.dm => human_update_icons.dm} | 0 ...update_icons.dm => monkey_update_icons.dm} | 0 ...update_icons.dm => living_update_icons.dm} | 0 .../{update_icon.dm => pai_update_icon.dm} | 0 ...{update_icons.dm => robot_update_icons.dm} | 0 .../{update_icons.dm => mob_update_icons.dm} | 0 ...pdate_icons.dm => wendigo_update_icons.dm} | 0 ...{update_icons.dm => human_update_icons.dm} | 0 ...update_icons.dm => living_update_icons.dm} | 0 tgstation.dme | 26 +++++++++---------- 14 files changed, 13 insertions(+), 13 deletions(-) rename code/modules/mob/living/carbon/alien/{update_icons.dm => alien_update_icons.dm} (100%) rename code/modules/mob/living/carbon/alien/humanoid/{update_icons.dm => humanoid_update_icons.dm} (100%) rename code/modules/mob/living/carbon/alien/larva/{update_icons.dm => larva_update_icons.dm} (100%) rename code/modules/mob/living/carbon/{update_icons.dm => carbon_update_icons.dm} (100%) rename code/modules/mob/living/carbon/human/{update_icons.dm => human_update_icons.dm} (100%) rename code/modules/mob/living/carbon/monkey/{update_icons.dm => monkey_update_icons.dm} (100%) rename code/modules/mob/living/{update_icons.dm => living_update_icons.dm} (100%) rename code/modules/mob/living/silicon/pai/{update_icon.dm => pai_update_icon.dm} (100%) rename code/modules/mob/living/silicon/robot/{update_icons.dm => robot_update_icons.dm} (100%) rename code/modules/mob/{update_icons.dm => mob_update_icons.dm} (100%) rename modular_splurt/code/modules/antagonists/wendigo/mob/{update_icons.dm => wendigo_update_icons.dm} (100%) rename modular_splurt/code/modules/mob/living/carbon/human/{update_icons.dm => human_update_icons.dm} (100%) rename modular_splurt/code/modules/mob/living/{update_icons.dm => living_update_icons.dm} (100%) diff --git a/code/modules/mob/living/carbon/alien/update_icons.dm b/code/modules/mob/living/carbon/alien/alien_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/alien/update_icons.dm rename to code/modules/mob/living/carbon/alien/alien_update_icons.dm diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/alien/humanoid/update_icons.dm rename to code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm diff --git a/code/modules/mob/living/carbon/alien/larva/update_icons.dm b/code/modules/mob/living/carbon/alien/larva/larva_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/alien/larva/update_icons.dm rename to code/modules/mob/living/carbon/alien/larva/larva_update_icons.dm diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/update_icons.dm rename to code/modules/mob/living/carbon/carbon_update_icons.dm diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/human/update_icons.dm rename to code/modules/mob/living/carbon/human/human_update_icons.dm diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/monkey_update_icons.dm similarity index 100% rename from code/modules/mob/living/carbon/monkey/update_icons.dm rename to code/modules/mob/living/carbon/monkey/monkey_update_icons.dm diff --git a/code/modules/mob/living/update_icons.dm b/code/modules/mob/living/living_update_icons.dm similarity index 100% rename from code/modules/mob/living/update_icons.dm rename to code/modules/mob/living/living_update_icons.dm diff --git a/code/modules/mob/living/silicon/pai/update_icon.dm b/code/modules/mob/living/silicon/pai/pai_update_icon.dm similarity index 100% rename from code/modules/mob/living/silicon/pai/update_icon.dm rename to code/modules/mob/living/silicon/pai/pai_update_icon.dm diff --git a/code/modules/mob/living/silicon/robot/update_icons.dm b/code/modules/mob/living/silicon/robot/robot_update_icons.dm similarity index 100% rename from code/modules/mob/living/silicon/robot/update_icons.dm rename to code/modules/mob/living/silicon/robot/robot_update_icons.dm diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/mob_update_icons.dm similarity index 100% rename from code/modules/mob/update_icons.dm rename to code/modules/mob/mob_update_icons.dm diff --git a/modular_splurt/code/modules/antagonists/wendigo/mob/update_icons.dm b/modular_splurt/code/modules/antagonists/wendigo/mob/wendigo_update_icons.dm similarity index 100% rename from modular_splurt/code/modules/antagonists/wendigo/mob/update_icons.dm rename to modular_splurt/code/modules/antagonists/wendigo/mob/wendigo_update_icons.dm diff --git a/modular_splurt/code/modules/mob/living/carbon/human/update_icons.dm b/modular_splurt/code/modules/mob/living/carbon/human/human_update_icons.dm similarity index 100% rename from modular_splurt/code/modules/mob/living/carbon/human/update_icons.dm rename to modular_splurt/code/modules/mob/living/carbon/human/human_update_icons.dm diff --git a/modular_splurt/code/modules/mob/living/update_icons.dm b/modular_splurt/code/modules/mob/living/living_update_icons.dm similarity index 100% rename from modular_splurt/code/modules/mob/living/update_icons.dm rename to modular_splurt/code/modules/mob/living/living_update_icons.dm diff --git a/tgstation.dme b/tgstation.dme index 96976371fc..7c7dfe377e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2629,12 +2629,12 @@ #include "code\modules\mob\mob_lists.dm" #include "code\modules\mob\mob_movement.dm" #include "code\modules\mob\mob_transformation_simple.dm" +#include "code\modules\mob\mob_update_icons.dm" #include "code\modules\mob\say.dm" #include "code\modules\mob\say_vr.dm" #include "code\modules\mob\status_procs.dm" #include "code\modules\mob\transform_procs.dm" #include "code\modules\mob\typing_indicator.dm" -#include "code\modules\mob\update_icons.dm" #include "code\modules\mob\camera\camera.dm" #include "code\modules\mob\dead\dead.dm" #include "code\modules\mob\dead\new_player\login.dm" @@ -2689,6 +2689,7 @@ #include "code\modules\mob\living\living_movement.dm" #include "code\modules\mob\living\living_signals.dm" #include "code\modules\mob\living\living_sprint.dm" +#include "code\modules\mob\living\living_update_icons.dm" #include "code\modules\mob\living\login.dm" #include "code\modules\mob\living\logout.dm" #include "code\modules\mob\living\say.dm" @@ -2696,7 +2697,6 @@ #include "code\modules\mob\living\stamina_buffer.dm" #include "code\modules\mob\living\status_procs.dm" #include "code\modules\mob\living\taste.dm" -#include "code\modules\mob\living\update_icons.dm" #include "code\modules\mob\living\ventcrawling.dm" #include "code\modules\mob\living\brain\brain.dm" #include "code\modules\mob\living\brain\brain_item.dm" @@ -2715,6 +2715,7 @@ #include "code\modules\mob\living\carbon\carbon_movement.dm" #include "code\modules\mob\living\carbon\carbon_sprint.dm" #include "code\modules\mob\living\carbon\carbon_stripping.dm" +#include "code\modules\mob\living\carbon\carbon_update_icons.dm" #include "code\modules\mob\living\carbon\damage_procs.dm" #include "code\modules\mob\living\carbon\death.dm" #include "code\modules\mob\living\carbon\emote.dm" @@ -2724,9 +2725,9 @@ #include "code\modules\mob\living\carbon\life.dm" #include "code\modules\mob\living\carbon\say.dm" #include "code\modules\mob\living\carbon\status_procs.dm" -#include "code\modules\mob\living\carbon\update_icons.dm" #include "code\modules\mob\living\carbon\alien\alien.dm" #include "code\modules\mob\living\carbon\alien\alien_defense.dm" +#include "code\modules\mob\living\carbon\alien\alien_update_icons.dm" #include "code\modules\mob\living\carbon\alien\damage_procs.dm" #include "code\modules\mob\living\carbon\alien\death.dm" #include "code\modules\mob\living\carbon\alien\emote.dm" @@ -2737,14 +2738,13 @@ #include "code\modules\mob\living\carbon\alien\say.dm" #include "code\modules\mob\living\carbon\alien\screen.dm" #include "code\modules\mob\living\carbon\alien\status_procs.dm" -#include "code\modules\mob\living\carbon\alien\update_icons.dm" #include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm" #include "code\modules\mob\living\carbon\alien\humanoid\death.dm" #include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm" #include "code\modules\mob\living\carbon\alien\humanoid\humanoid_defense.dm" +#include "code\modules\mob\living\carbon\alien\humanoid\humanoid_update_icons.dm" #include "code\modules\mob\living\carbon\alien\humanoid\life.dm" #include "code\modules\mob\living\carbon\alien\humanoid\queen.dm" -#include "code\modules\mob\living\carbon\alien\humanoid\update_icons.dm" #include "code\modules\mob\living\carbon\alien\humanoid\caste\drone.dm" #include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm" #include "code\modules\mob\living\carbon\alien\humanoid\caste\praetorian.dm" @@ -2753,9 +2753,9 @@ #include "code\modules\mob\living\carbon\alien\larva\inventory.dm" #include "code\modules\mob\living\carbon\alien\larva\larva.dm" #include "code\modules\mob\living\carbon\alien\larva\larva_defense.dm" +#include "code\modules\mob\living\carbon\alien\larva\larva_update_icons.dm" #include "code\modules\mob\living\carbon\alien\larva\life.dm" #include "code\modules\mob\living\carbon\alien\larva\powers.dm" -#include "code\modules\mob\living\carbon\alien\larva\update_icons.dm" #include "code\modules\mob\living\carbon\alien\special\alien_embryo.dm" #include "code\modules\mob\living\carbon\alien\special\facehugger.dm" #include "code\modules\mob\living\carbon\human\damage_procs.dm" @@ -2772,6 +2772,7 @@ #include "code\modules\mob\living\carbon\human\human_mobility.dm" #include "code\modules\mob\living\carbon\human\human_movement.dm" #include "code\modules\mob\living\carbon\human\human_stripping.dm" +#include "code\modules\mob\living\carbon\human\human_update_icons.dm" #include "code\modules\mob\living\carbon\human\inventory.dm" #include "code\modules\mob\living\carbon\human\life.dm" #include "code\modules\mob\living\carbon\human\login.dm" @@ -2780,7 +2781,6 @@ #include "code\modules\mob\living\carbon\human\species.dm" #include "code\modules\mob\living\carbon\human\status_procs.dm" #include "code\modules\mob\living\carbon\human\typing_indicator.dm" -#include "code\modules\mob\living\carbon\human\update_icons.dm" #include "code\modules\mob\living\carbon\human\innate_abilities\blobform.dm" #include "code\modules\mob\living\carbon\human\innate_abilities\coiling.dm" #include "code\modules\mob\living\carbon\human\innate_abilities\customization.dm" @@ -2816,8 +2816,8 @@ #include "code\modules\mob\living\carbon\monkey\life.dm" #include "code\modules\mob\living\carbon\monkey\monkey.dm" #include "code\modules\mob\living\carbon\monkey\monkey_defense.dm" +#include "code\modules\mob\living\carbon\monkey\monkey_update_icons.dm" #include "code\modules\mob\living\carbon\monkey\punpun.dm" -#include "code\modules\mob\living\carbon\monkey\update_icons.dm" #include "code\modules\mob\living\silicon\custom_holoform.dm" #include "code\modules\mob\living\silicon\damage_procs.dm" #include "code\modules\mob\living\silicon\death.dm" @@ -2849,10 +2849,10 @@ #include "code\modules\mob\living\silicon\pai\pai.dm" #include "code\modules\mob\living\silicon\pai\pai_defense.dm" #include "code\modules\mob\living\silicon\pai\pai_shell.dm" +#include "code\modules\mob\living\silicon\pai\pai_update_icon.dm" #include "code\modules\mob\living\silicon\pai\personality.dm" #include "code\modules\mob\living\silicon\pai\say.dm" #include "code\modules\mob\living\silicon\pai\software.dm" -#include "code\modules\mob\living\silicon\pai\update_icon.dm" #include "code\modules\mob\living\silicon\robot\death.dm" #include "code\modules\mob\living\silicon\robot\emote.dm" #include "code\modules\mob\living\silicon\robot\examine.dm" @@ -2867,8 +2867,8 @@ #include "code\modules\mob\living\silicon\robot\robot_modules.dm" #include "code\modules\mob\living\silicon\robot\robot_movement.dm" #include "code\modules\mob\living\silicon\robot\robot_sprint.dm" +#include "code\modules\mob\living\silicon\robot\robot_update_icons.dm" #include "code\modules\mob\living\silicon\robot\say.dm" -#include "code\modules\mob\living\silicon\robot\update_icons.dm" #include "code\modules\mob\living\simple_animal\animal_defense.dm" #include "code\modules\mob\living\simple_animal\astral.dm" #include "code\modules\mob\living\simple_animal\constructs.dm" @@ -4598,8 +4598,8 @@ #include "modular_splurt\code\modules\antagonists\wendigo\mob\mob_defense.dm" #include "modular_splurt\code\modules\antagonists\wendigo\mob\mob_equip.dm" #include "modular_splurt\code\modules\antagonists\wendigo\mob\organs_bodyparts.dm" -#include "modular_splurt\code\modules\antagonists\wendigo\mob\update_icons.dm" #include "modular_splurt\code\modules\antagonists\wendigo\mob\wendigo_defense.dm" +#include "modular_splurt\code\modules\antagonists\wendigo\mob\wendigo_update_icons.dm" #include "modular_splurt\code\modules\arousal\arousal.dm" #include "modular_splurt\code\modules\arousal\genitals.dm" #include "modular_splurt\code\modules\arousal\genitals_sprite_accessories.dm" @@ -4812,11 +4812,11 @@ #include "modular_splurt\code\modules\mob\living\living_mobility.dm" #include "modular_splurt\code\modules\mob\living\living_movement.dm" #include "modular_splurt\code\modules\mob\living\living_signals.dm" +#include "modular_splurt\code\modules\mob\living\living_update_icons.dm" #include "modular_splurt\code\modules\mob\living\login.dm" #include "modular_splurt\code\modules\mob\living\logout.dm" #include "modular_splurt\code\modules\mob\living\navigation.dm" #include "modular_splurt\code\modules\mob\living\say.dm" -#include "modular_splurt\code\modules\mob\living\update_icons.dm" #include "modular_splurt\code\modules\mob\living\brain\brain_item.dm" #include "modular_splurt\code\modules\mob\living\carbon\carbon.dm" #include "modular_splurt\code\modules\mob\living\carbon\carbon_defense.dm" @@ -4824,10 +4824,10 @@ #include "modular_splurt\code\modules\mob\living\carbon\human\human.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\human_defense.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\human_defines.dm" +#include "modular_splurt\code\modules\mob\living\carbon\human\human_update_icons.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\inventory.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\physiology.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\species.dm" -#include "modular_splurt\code\modules\mob\living\carbon\human\update_icons.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\species_types\arachnid.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\species_types\ashwalker.dm" #include "modular_splurt\code\modules\mob\living\carbon\human\species_types\ipc.dm" From 6c62423bbc6af215b0c0800fbe950beb555f5d8b Mon Sep 17 00:00:00 2001 From: SPLURT Bot <97993072+SPLURT-Station-Bot@users.noreply.github.com> Date: Thu, 12 Oct 2023 18:57:19 +0000 Subject: [PATCH 03/20] Automatic changelog generation for PR #963 [ci skip] --- html/changelogs/AutoChangeLog-pr-963.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-963.yml diff --git a/html/changelogs/AutoChangeLog-pr-963.yml b/html/changelogs/AutoChangeLog-pr-963.yml new file mode 100644 index 0000000000..130a1a5adf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-963.yml @@ -0,0 +1,4 @@ +author: Kuki-kono +delete-after: true +changes: + - bugfix: Gladiator no longer stays invincible From 505f9bf58f4aeb5b9b4a62339cd3cc12c14d9ec3 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 12 Oct 2023 18:59:09 +0000 Subject: [PATCH 04/20] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-963.yml | 4 ---- html/changelogs/archive/2023-10.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-963.yml diff --git a/html/changelogs/AutoChangeLog-pr-963.yml b/html/changelogs/AutoChangeLog-pr-963.yml deleted file mode 100644 index 130a1a5adf..0000000000 --- a/html/changelogs/AutoChangeLog-pr-963.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Kuki-kono -delete-after: true -changes: - - bugfix: Gladiator no longer stays invincible diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index 18f2477f22..e0d5dea15c 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -28,3 +28,6 @@ - bugfix: Fixes the bug of assistants not receiving backpack donator items yip: - rscadd: yip +2023-10-12: + Kuki-kono: + - bugfix: Gladiator no longer stays invincible From 52ff793b333952205787e84178e8936bbf6ea1df Mon Sep 17 00:00:00 2001 From: Zattarra Date: Fri, 13 Oct 2023 21:29:11 -0700 Subject: [PATCH 05/20] Initial implementation of holo HUDs. --- .../code/modules/client/loadout/glasses.dm | 20 +++++++ .../code/modules/clothing/glasses/hud.dm | 53 ++++++++++++++++++ modular_splurt/icons/mobs/eyes.dmi | Bin 1567 -> 1555 bytes modular_splurt/icons/obj/clothing/glasses.dmi | Bin 14816 -> 3726 bytes 4 files changed, 73 insertions(+) diff --git a/modular_splurt/code/modules/client/loadout/glasses.dm b/modular_splurt/code/modules/client/loadout/glasses.dm index 74c8a440b1..61979e2bc8 100644 --- a/modular_splurt/code/modules/client/loadout/glasses.dm +++ b/modular_splurt/code/modules/client/loadout/glasses.dm @@ -36,3 +36,23 @@ /datum/gear/glasses/aviators name = "Aviators" path = /obj/item/clothing/glasses/aviators + +/datum/gear/glasses/blueshield/holo + name = "Holo Blueshield HUD Glasses" + path = /obj/item/clothing/glasses/hud/blueshield/holo + restricted_roles = list("Blueshield") + +/datum/gear/glasses/blueshield/holo/prescription + name = "Prescription Holo Blueshield HUD Glasses" + path = /obj/item/clothing/glasses/hud/blueshield/holo/prescription + restricted_roles = list("Blueshield") + +/datum/gear/glasses/security/sunglasses/holo + name = "Holo Secuirity HUD Glasses" + path = /obj/item/clothing/glasses/hud/security/sunglasses/holo + restricted_roles = list("Security Officer", "Warden", "Head of Security") + +/datum/gear/glasses/security/sunglasses/holo/prescription + name = "Prescription Holo Secuirity HUD Glasses" + path = /obj/item/clothing/glasses/hud/security/sunglasses/holo/prescription + restricted_roles = list("Security Officer", "Warden", "Head of Security") diff --git a/modular_splurt/code/modules/clothing/glasses/hud.dm b/modular_splurt/code/modules/clothing/glasses/hud.dm index e6df06cf4a..4ba68c4547 100644 --- a/modular_splurt/code/modules/clothing/glasses/hud.dm +++ b/modular_splurt/code/modules/clothing/glasses/hud.dm @@ -80,6 +80,46 @@ desc = "A HUD with multiple functions. Equipped with prescription lenses." vision_correction = 1 +/obj/item/clothing/glasses/hud/blueshield/holo + name = "holo blueshield HUD glasses" + desc = "A HUD with multiple functions. Nearly invisible when worn. Still protects from flashes." + actions_types = list(/datum/action/item_action/switch_hud) + icon_state = "holohudmed" + icon = 'modular_splurt/icons/obj/clothing/glasses.dmi' + item_state = "holo" + mob_overlay_icon = 'modular_splurt/icons/mobs/eyes.dmi' + flash_protect = 1 + +/obj/item/clothing/glasses/hud/blueshield/holo/attack_self(mob/user) + if(!ishuman(user)) + return + var/mob/living/carbon/human/wearer = user + if (wearer.glasses != src) + return + + if (hud_type) + var/datum/atom_hud/H = GLOB.huds[hud_type] + H.remove_hud_from(user) + + if (hud_type == DATA_HUD_MEDICAL_ADVANCED) + hud_type = null + icon_state = "holohud" + else if (hud_type == DATA_HUD_SECURITY_ADVANCED) + hud_type = DATA_HUD_MEDICAL_ADVANCED + icon_state = "holohudmed" + else + hud_type = DATA_HUD_SECURITY_ADVANCED + icon_state = "holohudsec" + + if (hud_type) + var/datum/atom_hud/H = GLOB.huds[hud_type] + H.add_hud_to(user) + +/obj/item/clothing/glasses/hud/blueshield/holo/prescription + name = "prescription holo blueshield HUD glasses" + desc = "A HUD with multiple functions. Nearly invisible when worn. Equipped with prescription lenses." + vision_correction = 1 + // Med HUDs /obj/item/clothing/glasses/hud/health/sunglasses/aviators @@ -108,6 +148,19 @@ desc = "aviators with a security HUD with prescription lenses." vision_correction = 1 +/obj/item/clothing/glasses/hud/security/sunglasses/holo + name = "holo security HUD glasses" + desc = "Sunglasses with a security HUD. Nearly invisible when worn." + icon_state = "holohudsec" + icon = 'modular_splurt/icons/obj/clothing/glasses.dmi' + item_state = "holo" + mob_overlay_icon = 'modular_splurt/icons/mobs/eyes.dmi' + +/obj/item/clothing/glasses/hud/security/sunglasses/holo/prescription + name = "prescription holo security HUD glasses" + desc = "Sunglasses with a security HUD. Nearly invisible when worn. Equipped with prescription lenses." + vision_correction = 1 + // Diag HUDs /obj/item/clothing/glasses/hud/diagnostic/sunglasses/aviators diff --git a/modular_splurt/icons/mobs/eyes.dmi b/modular_splurt/icons/mobs/eyes.dmi index 8b8e22abb90df5170409c009ad75b970d0137dc2..ecb7098a4fe4715d4562d72f8edecd9393989124 100644 GIT binary patch delta 1124 zcmV-q1e^Px43i9yB!8TGR9JLGWpiV4X>fFDZ*Bkpc$|&Qy$XXc6o%nBxrz_nOMhIm z6s2U)TaeHk&4FqlCs^96@6fRnGrsWf*0^>zJD}~Y-Y5yj6$Z`WsMV8w4luZ!wF<;@ z$ls9cGQpsFySTB$RB7co2@D#orsNh97@U6L7^i6$%d2eaHh*@x+>Ju_V(Zz>#hBJ| zyO7_tAwJ?iRHGYOw7u0I8n1u_2N0F=000FtNkl%H%>aaE z076S0z~bWKPMZ7bExq>spGo@{&VM)%#p12a_WQ?P7>Ikn9?V1im#>$Wc7DElH-6jR ze&o-d>+g@3jvtRV$H)7!e1`TH{n@84ZY6(SzjJCR%YXHUU)#O+pIrK7F!}Su#6+h5 z{*8@|RQC^37VkfG03V$DF6J+fMMT8I?Gr;s`fqPWL|puMCCcSD(tcbjS^siBj^r;` zrBc~>>+Hth{N=H&h`;wE>-E>~oJ#EZjlqbBa=F~`eaS->@4wIg2N0QGf`w)PLNfrN z8Gz6XK$8jsKz|v4&SMBK}A z=_m4hgtITt?m8dg>DPbEbVU50-@meJ@2~$fv#;|J_B9^8QmO1jbZ$Oa2jf;bnIsGlI{XaK8w-pib{2Qx(WPUzEM8tz1p52Uy_+n{# z-{&KEK7i2t4wF9uBa`q0Fn@hMz~toQa;a2`wY9ZqG#Zh-u2!pOvUte0^&8b{wfMOA zGk%uk)^({=idwCf`5v_PzgDaLdoPcDPp;o+HrLl8qEsjhC$GEl{qJc!`qb3aazw{#<>Yl<>mMY~2LuqB-vN^`0x^^D z10h|OTFGlheEV9t&&U7jpPBgY)XT~1yw-mb^ve79d;p>O9h2b$K9ev56knG5 ze1OTx$>l>UhgR=jx*tbZkB%g-osZvr^YQnxesk{1YOH)4g>SBpB(J;i{qJc!`svS4 z&qPGr{OIOv@;dbgb+KNVkG~hASFg=PMAYAVdp3EU*ZK#^^8tkBcaxz6DwFO5C_P&0 z^8u2Q^YNQ=S5^zt7c!p_-fFDZ*Bkpc$|&Qy$ZrG6o%nBxr&c=7k|2D zkrv6&-a-lHq&Y(y$O#p_dIv`lGrsWfwzv*AJE0$~-YE;G4F=uesMUjgi7>dFwTi?` zET53#3c;XxxwNyS+-T)F3k*7~LUt<&3{Ky0P9glo@~oS>oqt`aceBvF+In_NHKwiJ zuH=8&7Q@t|AFX}^DxGz*nMePd000F-NklROw_8&!V7g1H;fVNLfJUC=-Ua;n_gh3NGDc7lR-SO6vv+ZM{qn$w0=C zSv*NSXyi3R+;LV&d>OBW-+x!D)e4E~sXmm zZfq=GI&dJ~oSxp5k)t7kF3{UxpOpe&#zBJMAT}vf!~)rWbyoW`FjA7`4TKN0}z@42+aV5 zW&lDn0Fz$=1(OZ~J%1^U+I)Pv)Z@{6A9U99=>JdN*K>IMbUe6Kd}M!w!{hrS;$D_Z zKau+*oOt>Cmi-Z)e*MQxN5ud6{VQAU{k5NFx3xdQw#K8^>-Eiu!Of>1#QODmee>O^ zx%G&M;-QBJ+qd_wMMQjg{pVUV zKI3ay>>iiPg*`271Ck6x`-7b7Ar zUAlBUd7Szi4YA%EUaeLa^STGUYvmpPo>HkE5%GJgRZAY{wf;_We*^%b`3{p213Qy1 z0vB3Ky+1%waz1{$(^)CzFeAP@pT1ZqOm@%ZJ|F-6&dPE-qTDP@CXa`4KK?eZW$2%O z-{aAHZ}^^4sh-!2_};a0pO635KQr;)Y1NX)d9D8>7?tPm{s2Pr9g|@N9+MCR5|a=E zB43tze}GD*vbg)^?xp+Z?#I5ReMgeV&c`3V`S|^;-??ykDQSAMNgfa5^Y3ds z`mxWC%|=Ar_~^#@=&}hK#58&?s*n9_*;R8Vye*rvg V^NCV)*I57n002ovPDHLkV1lNcR+j(( diff --git a/modular_splurt/icons/obj/clothing/glasses.dmi b/modular_splurt/icons/obj/clothing/glasses.dmi index 3c19a1f5f8adb65f2d3570db3f8a180abbd4752f..b74feabf8551379ec2e958bef5833724cb291160 100644 GIT binary patch literal 3726 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 Wa?=jNc=5pmXx}%`_@rk2`hNhlB||{~ literal 14816 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 NSCCPau9Gwk{Xgj?8fyRm From 6d433b941ef43075aaabec6d8f59810c2d9977f2 Mon Sep 17 00:00:00 2001 From: AshTheDerg <60045745+AshTheDerg@users.noreply.github.com> Date: Sun, 15 Oct 2023 19:58:28 -0400 Subject: [PATCH 06/20] Tailbags Tailbags as a wallet+ option, available for 1 point in loadout, or crafted --- .../game/objects/items/storage/tailbag.dm | 136 ++++++++++++++++++ .../code/modules/client/loadout/hands.dm | 6 + modular_splurt/icons/obj/storage.dmi | Bin 4731 -> 5258 bytes 3 files changed, 142 insertions(+) create mode 100644 modular_splurt/code/game/objects/items/storage/tailbag.dm diff --git a/modular_splurt/code/game/objects/items/storage/tailbag.dm b/modular_splurt/code/game/objects/items/storage/tailbag.dm new file mode 100644 index 0000000000..156d4f9a9f --- /dev/null +++ b/modular_splurt/code/game/objects/items/storage/tailbag.dm @@ -0,0 +1,136 @@ +/obj/item/storage/tailbag + name = "tailbag" + desc = "A bag for holding small items. It fastens around the base of the tail." + icon = 'modular_splurt/icons/obj/storage.dmi' + icon_state = "tailbag" + w_class = WEIGHT_CLASS_SMALL + resistance_flags = FLAMMABLE + slot_flags = ITEM_SLOT_ID + + var/obj/item/card/id/front_id = null + var/list/combined_access + +/obj/item/storage/tailbag/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 6 + STR.cant_hold = typecacheof(list(/obj/item/screwdriver/power)) + STR.can_hold = typecacheof(list( + /obj/item/stack/spacecash, + /obj/item/holochip, + /obj/item/card, + /obj/item/clothing/mask/cigarette, + /obj/item/flashlight/pen, + /obj/item/seeds, + /obj/item/stack/medical, + /obj/item/toy/crayon, + /obj/item/coin, + /obj/item/dice, + /obj/item/disk, + /obj/item/implanter, + /obj/item/lighter, + /obj/item/lipstick, + /obj/item/match, + /obj/item/paper, + /obj/item/pen, + /obj/item/photo, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/syringe, + /obj/item/screwdriver, + /obj/item/multitool, + /obj/item/wrench, + /obj/item/wirecutters, + /obj/item/valentine, + /obj/item/stamp, + /obj/item/key, + /obj/item/cartridge, + /obj/item/camera_film, + /obj/item/stack/ore/bluespace_crystal, + /obj/item/reagent_containers/food/snacks/grown/poppy, + /obj/item/instrument/harmonica, + /obj/item/mining_voucher, + /obj/item/suit_voucher, + /obj/item/reagent_containers/pill, + /obj/item/gun/ballistic/derringer, + /obj/item/genital_equipment/condom, + /obj/item/restraints/handcuffs, + /obj/item/assembly/flash, + /obj/item/laser_pointer, + /obj/item/pda, + /obj/item/paicard)) + +/obj/item/storage/tailbag/Exited(atom/movable/AM) + . = ..() + refreshID() + +/obj/item/storage/tailbag/proc/refreshID() + LAZYCLEARLIST(combined_access) + if(!(front_id in src)) + front_id = null + for(var/obj/item/card/id/I in contents) + if(!front_id) + front_id = I + LAZYINITLIST(combined_access) + combined_access |= I.access + update_icon() + +/obj/item/storage/tailbag/Entered(atom/movable/AM) + . = ..() + refreshID() + +/obj/item/storage/tailbag/update_icon_state() + var/new_state = "tailbag" + if(front_id) + new_state = "tailbag_id" + if(new_state != icon_state) //avoid so many icon state changes. + icon_state = new_state + +/obj/item/storage/tailbag/GetID() + return front_id + +/obj/item/storage/tailbag/RemoveID() + if(!front_id) + return + . = front_id + front_id.forceMove(get_turf(src)) + +/obj/item/storage/tailbag/InsertID(obj/item/inserting_item) + var/obj/item/card/inserting_id = inserting_item.RemoveID() + if(!inserting_id) + return FALSE + attackby(inserting_id) + if(inserting_id in contents) + return TRUE + return FALSE + +/obj/item/storage/tailbag/GetAccess() + if(LAZYLEN(combined_access)) + return combined_access + else + return ..() + +/obj/item/storage/tailbag/xtralg + name = "XL Tailbag" + desc = "A larger tail bag for larger creatures" + icon = 'modular_splurt/icons/obj/storage.dmi' + icon_state = tailbag_xl + +/obj/item/storage/tailbag/xtralg/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 8 + +/datum/crafting_recipe/tailbag + name = "Tailbag" + result = /obj/item/storage/tailbag + reqs = list(/obj/item/stack/sheet/leather = 2) + time = 30 + category = CAT_CLOTHING + +/datum/crafting_recipe/tailbag_xl + name = "XL Tailbag" + result = /obj/item/storage/tailbag/xl + reqs = list(/obj/item/storage/tailbag = 1, + /obj/item/stack/sheet/leather = 2) + time = 30 + category = CAT_CLOTHING diff --git a/modular_splurt/code/modules/client/loadout/hands.dm b/modular_splurt/code/modules/client/loadout/hands.dm index 07f6391c69..6d5c193b6a 100644 --- a/modular_splurt/code/modules/client/loadout/hands.dm +++ b/modular_splurt/code/modules/client/loadout/hands.dm @@ -3,3 +3,9 @@ description = "A personal AI device for checking and downloading various personalities." path = /obj/item/paicard cost = 3 + +/datum/gear/hands/tailbag + name = "Tailbag" + description = "A bag for holding small personal items, which fastens around the base of the tail." + path = /obj/item/tailbag + cost = 1 diff --git a/modular_splurt/icons/obj/storage.dmi b/modular_splurt/icons/obj/storage.dmi index 6ff028b18c01a37fcba91e88e3970e268c9a82af..49377b6b9eafdb431b9817fb1c169fa78af67bef 100644 GIT binary patch literal 5258 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 Z8fD{tNq6~K1-M)U>1i2jR;fG0{2yk&F!cZc literal 4731 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 Date: Sun, 15 Oct 2023 20:24:34 -0400 Subject: [PATCH 08/20] Tailbags --- .../game/objects/items/storage/tailbag.dm | 272 +++++++++--------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/modular_splurt/code/game/objects/items/storage/tailbag.dm b/modular_splurt/code/game/objects/items/storage/tailbag.dm index 156d4f9a9f..65f76eee9b 100644 --- a/modular_splurt/code/game/objects/items/storage/tailbag.dm +++ b/modular_splurt/code/game/objects/items/storage/tailbag.dm @@ -1,136 +1,136 @@ -/obj/item/storage/tailbag - name = "tailbag" - desc = "A bag for holding small items. It fastens around the base of the tail." - icon = 'modular_splurt/icons/obj/storage.dmi' - icon_state = "tailbag" - w_class = WEIGHT_CLASS_SMALL - resistance_flags = FLAMMABLE - slot_flags = ITEM_SLOT_ID - - var/obj/item/card/id/front_id = null - var/list/combined_access - -/obj/item/storage/tailbag/ComponentInitialize() - . = ..() - var/datum/component/storage/STR = GetComponent(/datum/component/storage) - STR.max_items = 6 - STR.cant_hold = typecacheof(list(/obj/item/screwdriver/power)) - STR.can_hold = typecacheof(list( - /obj/item/stack/spacecash, - /obj/item/holochip, - /obj/item/card, - /obj/item/clothing/mask/cigarette, - /obj/item/flashlight/pen, - /obj/item/seeds, - /obj/item/stack/medical, - /obj/item/toy/crayon, - /obj/item/coin, - /obj/item/dice, - /obj/item/disk, - /obj/item/implanter, - /obj/item/lighter, - /obj/item/lipstick, - /obj/item/match, - /obj/item/paper, - /obj/item/pen, - /obj/item/photo, - /obj/item/reagent_containers/dropper, - /obj/item/reagent_containers/syringe, - /obj/item/screwdriver, - /obj/item/multitool, - /obj/item/wrench, - /obj/item/wirecutters, - /obj/item/valentine, - /obj/item/stamp, - /obj/item/key, - /obj/item/cartridge, - /obj/item/camera_film, - /obj/item/stack/ore/bluespace_crystal, - /obj/item/reagent_containers/food/snacks/grown/poppy, - /obj/item/instrument/harmonica, - /obj/item/mining_voucher, - /obj/item/suit_voucher, - /obj/item/reagent_containers/pill, - /obj/item/gun/ballistic/derringer, - /obj/item/genital_equipment/condom, - /obj/item/restraints/handcuffs, - /obj/item/assembly/flash, - /obj/item/laser_pointer, - /obj/item/pda, - /obj/item/paicard)) - -/obj/item/storage/tailbag/Exited(atom/movable/AM) - . = ..() - refreshID() - -/obj/item/storage/tailbag/proc/refreshID() - LAZYCLEARLIST(combined_access) - if(!(front_id in src)) - front_id = null - for(var/obj/item/card/id/I in contents) - if(!front_id) - front_id = I - LAZYINITLIST(combined_access) - combined_access |= I.access - update_icon() - -/obj/item/storage/tailbag/Entered(atom/movable/AM) - . = ..() - refreshID() - -/obj/item/storage/tailbag/update_icon_state() - var/new_state = "tailbag" - if(front_id) - new_state = "tailbag_id" - if(new_state != icon_state) //avoid so many icon state changes. - icon_state = new_state - -/obj/item/storage/tailbag/GetID() - return front_id - -/obj/item/storage/tailbag/RemoveID() - if(!front_id) - return - . = front_id - front_id.forceMove(get_turf(src)) - -/obj/item/storage/tailbag/InsertID(obj/item/inserting_item) - var/obj/item/card/inserting_id = inserting_item.RemoveID() - if(!inserting_id) - return FALSE - attackby(inserting_id) - if(inserting_id in contents) - return TRUE - return FALSE - -/obj/item/storage/tailbag/GetAccess() - if(LAZYLEN(combined_access)) - return combined_access - else - return ..() - -/obj/item/storage/tailbag/xtralg - name = "XL Tailbag" - desc = "A larger tail bag for larger creatures" - icon = 'modular_splurt/icons/obj/storage.dmi' - icon_state = tailbag_xl - -/obj/item/storage/tailbag/xtralg/ComponentInitialize() - . = ..() - var/datum/component/storage/STR = GetComponent(/datum/component/storage) - STR.max_items = 8 - -/datum/crafting_recipe/tailbag - name = "Tailbag" - result = /obj/item/storage/tailbag - reqs = list(/obj/item/stack/sheet/leather = 2) - time = 30 - category = CAT_CLOTHING - -/datum/crafting_recipe/tailbag_xl - name = "XL Tailbag" - result = /obj/item/storage/tailbag/xl - reqs = list(/obj/item/storage/tailbag = 1, - /obj/item/stack/sheet/leather = 2) - time = 30 - category = CAT_CLOTHING +/obj/item/storage/tailbag + name = "tailbag" + desc = "A bag for holding small items. It fastens around the base of the tail." + icon = 'modular_splurt/icons/obj/storage.dmi' + icon_state = "tailbag" + w_class = WEIGHT_CLASS_SMALL + resistance_flags = FLAMMABLE + slot_flags = ITEM_SLOT_ID + + var/obj/item/card/id/front_id = null + var/list/combined_access + +/obj/item/storage/tailbag/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 6 + STR.cant_hold = typecacheof(list(/obj/item/screwdriver/power)) + STR.can_hold = typecacheof(list( + /obj/item/stack/spacecash, + /obj/item/holochip, + /obj/item/card, + /obj/item/clothing/mask/cigarette, + /obj/item/flashlight/pen, + /obj/item/seeds, + /obj/item/stack/medical, + /obj/item/toy/crayon, + /obj/item/coin, + /obj/item/dice, + /obj/item/disk, + /obj/item/implanter, + /obj/item/lighter, + /obj/item/lipstick, + /obj/item/match, + /obj/item/paper, + /obj/item/pen, + /obj/item/photo, + /obj/item/reagent_containers/dropper, + /obj/item/reagent_containers/syringe, + /obj/item/screwdriver, + /obj/item/multitool, + /obj/item/wrench, + /obj/item/wirecutters, + /obj/item/valentine, + /obj/item/stamp, + /obj/item/key, + /obj/item/cartridge, + /obj/item/camera_film, + /obj/item/stack/ore/bluespace_crystal, + /obj/item/reagent_containers/food/snacks/grown/poppy, + /obj/item/instrument/harmonica, + /obj/item/mining_voucher, + /obj/item/suit_voucher, + /obj/item/reagent_containers/pill, + /obj/item/gun/ballistic/derringer, + /obj/item/genital_equipment/condom, + /obj/item/restraints/handcuffs, + /obj/item/assembly/flash, + /obj/item/laser_pointer, + /obj/item/pda, + /obj/item/paicard)) + +/obj/item/storage/tailbag/Exited(atom/movable/AM) + . = ..() + refreshID() + +/obj/item/storage/tailbag/proc/refreshID() + LAZYCLEARLIST(combined_access) + if(!(front_id in src)) + front_id = null + for(var/obj/item/card/id/I in contents) + if(!front_id) + front_id = I + LAZYINITLIST(combined_access) + combined_access |= I.access + update_icon() + +/obj/item/storage/tailbag/Entered(atom/movable/AM) + . = ..() + refreshID() + +/obj/item/storage/tailbag/update_icon_state() + var/new_state = "tailbag" + if(front_id) + new_state = "tailbag_id" + if(new_state != icon_state) //avoid so many icon state changes. + icon_state = new_state + +/obj/item/storage/tailbag/GetID() + return front_id + +/obj/item/storage/tailbag/RemoveID() + if(!front_id) + return + . = front_id + front_id.forceMove(get_turf(src)) + +/obj/item/storage/tailbag/InsertID(obj/item/inserting_item) + var/obj/item/card/inserting_id = inserting_item.RemoveID() + if(!inserting_id) + return FALSE + attackby(inserting_id) + if(inserting_id in contents) + return TRUE + return FALSE + +/obj/item/storage/tailbag/GetAccess() + if(LAZYLEN(combined_access)) + return combined_access + else + return ..() + +/obj/item/storage/tailbag/xtralg + name = "XL Tailbag" + desc = "A larger tail bag for larger creatures" + icon = 'modular_splurt/icons/obj/storage.dmi' + icon_state = tailbag_xl + +/obj/item/storage/tailbag/xtralg/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_items = 8 + +/datum/crafting_recipe/tailbag + name = "Tailbag" + result = /obj/item/storage/tailbag + reqs = list(/obj/item/stack/sheet/leather = 2) + time = 30 + category = CAT_CLOTHING + +/datum/crafting_recipe/tailbag_xl + name = "XL Tailbag" + result = /obj/item/storage/tailbag/xl + reqs = list(/obj/item/storage/tailbag = 1, + /obj/item/stack/sheet/leather = 2) + time = 30 + category = CAT_CLOTHING From c95ca9e219e13aaa7d4811cd09cdcb318e577429 Mon Sep 17 00:00:00 2001 From: AshTheDerg <60045745+AshTheDerg@users.noreply.github.com> Date: Sun, 15 Oct 2023 20:25:15 -0400 Subject: [PATCH 09/20] Tailbags Loadout option --- .../code/modules/client/loadout/hands.dm | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modular_splurt/code/modules/client/loadout/hands.dm b/modular_splurt/code/modules/client/loadout/hands.dm index 6d5c193b6a..5f8ef4f631 100644 --- a/modular_splurt/code/modules/client/loadout/hands.dm +++ b/modular_splurt/code/modules/client/loadout/hands.dm @@ -1,11 +1,11 @@ -/datum/gear/hands/paicard - name = "pAI device" - description = "A personal AI device for checking and downloading various personalities." - path = /obj/item/paicard - cost = 3 - -/datum/gear/hands/tailbag - name = "Tailbag" - description = "A bag for holding small personal items, which fastens around the base of the tail." - path = /obj/item/tailbag - cost = 1 +/datum/gear/hands/paicard + name = "pAI device" + description = "A personal AI device for checking and downloading various personalities." + path = /obj/item/paicard + cost = 3 + +/datum/gear/hands/tailbag + name = "Tailbag" + description = "A bag for holding small personal items, which fastens around the base of the tail." + path = /obj/item/tailbag + cost = 1 From 7e7e4befd49454ebec0c296ee83b541e292e7746 Mon Sep 17 00:00:00 2001 From: AshTheDerg <60045745+AshTheDerg@users.noreply.github.com> Date: Sun, 15 Oct 2023 20:34:37 -0400 Subject: [PATCH 10/20] Tailbags Include tailbag.dm --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index 3fd3374b9b..8a160a13b2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4523,6 +4523,7 @@ #include "modular_splurt\code\game\objects\items\storage\boxes.dm" #include "modular_splurt\code\game\objects\items\storage\firstaid.dm" #include "modular_splurt\code\game\objects\items\storage\secure.dm" +#include "modular_splurt\code\game\objects\items\storage\tailbag.dm #include "modular_splurt\code\game\objects\items\storage\wallets.dm" #include "modular_splurt\code\game\objects\items\weaponry\armyknife.dm" #include "modular_splurt\code\game\objects\items\weaponry\melee.dm" From fb19325769b7421e102462fe10b9fd14f502c282 Mon Sep 17 00:00:00 2001 From: AshTheDerg <60045745+AshTheDerg@users.noreply.github.com> Date: Sun, 15 Oct 2023 20:48:37 -0400 Subject: [PATCH 11/20] Tailbags Fixed missing Quotation Mark --- tgstation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 8a160a13b2..15c777f7b5 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4523,7 +4523,7 @@ #include "modular_splurt\code\game\objects\items\storage\boxes.dm" #include "modular_splurt\code\game\objects\items\storage\firstaid.dm" #include "modular_splurt\code\game\objects\items\storage\secure.dm" -#include "modular_splurt\code\game\objects\items\storage\tailbag.dm +#include "modular_splurt\code\game\objects\items\storage\tailbag.dm" #include "modular_splurt\code\game\objects\items\storage\wallets.dm" #include "modular_splurt\code\game\objects\items\weaponry\armyknife.dm" #include "modular_splurt\code\game\objects\items\weaponry\melee.dm" From 0aa25faca611a5a6db85d3465a5df6b7225c913b Mon Sep 17 00:00:00 2001 From: AshTheDerg <60045745+AshTheDerg@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:14:51 -0400 Subject: [PATCH 12/20] Tailbags --- modular_splurt/code/game/objects/items/storage/tailbag.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_splurt/code/game/objects/items/storage/tailbag.dm b/modular_splurt/code/game/objects/items/storage/tailbag.dm index 65f76eee9b..414cef5a89 100644 --- a/modular_splurt/code/game/objects/items/storage/tailbag.dm +++ b/modular_splurt/code/game/objects/items/storage/tailbag.dm @@ -113,7 +113,7 @@ name = "XL Tailbag" desc = "A larger tail bag for larger creatures" icon = 'modular_splurt/icons/obj/storage.dmi' - icon_state = tailbag_xl + icon_state = "tailbag_xl" /obj/item/storage/tailbag/xtralg/ComponentInitialize() . = ..() From c226169db70014c42234a1f15a09341ed6a85198 Mon Sep 17 00:00:00 2001 From: AshTheDerg <60045745+AshTheDerg@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:22:27 -0400 Subject: [PATCH 13/20] Tailbag --- modular_splurt/code/game/objects/items/storage/tailbag.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_splurt/code/game/objects/items/storage/tailbag.dm b/modular_splurt/code/game/objects/items/storage/tailbag.dm index 414cef5a89..0b9b4764f3 100644 --- a/modular_splurt/code/game/objects/items/storage/tailbag.dm +++ b/modular_splurt/code/game/objects/items/storage/tailbag.dm @@ -129,7 +129,7 @@ /datum/crafting_recipe/tailbag_xl name = "XL Tailbag" - result = /obj/item/storage/tailbag/xl + result = /obj/item/storage/tailbag/xtralg reqs = list(/obj/item/storage/tailbag = 1, /obj/item/stack/sheet/leather = 2) time = 30 From 097c5f8204384e8ebd22f6056a4b07b4479a8e1f Mon Sep 17 00:00:00 2001 From: AshTheDerg <60045745+AshTheDerg@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:23:02 -0400 Subject: [PATCH 14/20] Tailbags --- modular_splurt/code/modules/client/loadout/hands.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_splurt/code/modules/client/loadout/hands.dm b/modular_splurt/code/modules/client/loadout/hands.dm index 5f8ef4f631..e5dcf4ae64 100644 --- a/modular_splurt/code/modules/client/loadout/hands.dm +++ b/modular_splurt/code/modules/client/loadout/hands.dm @@ -7,5 +7,5 @@ /datum/gear/hands/tailbag name = "Tailbag" description = "A bag for holding small personal items, which fastens around the base of the tail." - path = /obj/item/tailbag + path = /obj/item/storage/tailbag cost = 1 From ded064d98be1739a27785919e0695fa040e30bf3 Mon Sep 17 00:00:00 2001 From: SPLURT Bot <97993072+SPLURT-Station-Bot@users.noreply.github.com> Date: Mon, 16 Oct 2023 04:52:31 +0000 Subject: [PATCH 15/20] Automatic changelog generation for PR #979 [ci skip] --- html/changelogs/AutoChangeLog-pr-979.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-979.yml diff --git a/html/changelogs/AutoChangeLog-pr-979.yml b/html/changelogs/AutoChangeLog-pr-979.yml new file mode 100644 index 0000000000..8b76ce3ccd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-979.yml @@ -0,0 +1,4 @@ +author: AshTheDerg +delete-after: true +changes: + - rscadd: Added tailbags From 24031ac4490b8d56adfbfc836c6c853dbcd77e06 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 16 Oct 2023 04:53:54 +0000 Subject: [PATCH 16/20] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-979.yml | 4 ---- html/changelogs/archive/2023-10.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-979.yml diff --git a/html/changelogs/AutoChangeLog-pr-979.yml b/html/changelogs/AutoChangeLog-pr-979.yml deleted file mode 100644 index 8b76ce3ccd..0000000000 --- a/html/changelogs/AutoChangeLog-pr-979.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: AshTheDerg -delete-after: true -changes: - - rscadd: Added tailbags diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index e0d5dea15c..1b78b9ee97 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -31,3 +31,6 @@ 2023-10-12: Kuki-kono: - bugfix: Gladiator no longer stays invincible +2023-10-16: + AshTheDerg: + - rscadd: Added tailbags From 93c135adbd572d654083f91dcf8707f78f185dc6 Mon Sep 17 00:00:00 2001 From: SPLURT Bot <97993072+SPLURT-Station-Bot@users.noreply.github.com> Date: Mon, 16 Oct 2023 05:25:23 +0000 Subject: [PATCH 17/20] Automatic changelog generation for PR #977 [ci skip] --- html/changelogs/AutoChangeLog-pr-977.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-977.yml diff --git a/html/changelogs/AutoChangeLog-pr-977.yml b/html/changelogs/AutoChangeLog-pr-977.yml new file mode 100644 index 0000000000..fd8d302a68 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-977.yml @@ -0,0 +1,6 @@ +author: Zattarra +delete-after: true +changes: + - rscadd: Adds holo HUD sunglasses to the game, invisible versions of normal HUD + sunglasses. + - rscadd: Implements holo HUD sunglasses to the loadout screen. From b641c133b29aa4ea15cc4a828d13ba9c563d4e1e Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 16 Oct 2023 05:26:49 +0000 Subject: [PATCH 18/20] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-977.yml | 6 ------ html/changelogs/archive/2023-10.yml | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-977.yml diff --git a/html/changelogs/AutoChangeLog-pr-977.yml b/html/changelogs/AutoChangeLog-pr-977.yml deleted file mode 100644 index fd8d302a68..0000000000 --- a/html/changelogs/AutoChangeLog-pr-977.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Zattarra -delete-after: true -changes: - - rscadd: Adds holo HUD sunglasses to the game, invisible versions of normal HUD - sunglasses. - - rscadd: Implements holo HUD sunglasses to the loadout screen. diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index 1b78b9ee97..5f9907d373 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -34,3 +34,7 @@ 2023-10-16: AshTheDerg: - rscadd: Added tailbags + Zattarra: + - rscadd: Adds holo HUD sunglasses to the game, invisible versions of normal HUD + sunglasses. + - rscadd: Implements holo HUD sunglasses to the loadout screen. From 96bdb19dd348c648033d6c10a30bbd43e6d773e8 Mon Sep 17 00:00:00 2001 From: SPLURT Bot <97993072+SPLURT-Station-Bot@users.noreply.github.com> Date: Mon, 16 Oct 2023 23:28:02 +0000 Subject: [PATCH 19/20] Automatic changelog generation for PR #973 [ci skip] --- html/changelogs/AutoChangeLog-pr-973.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-973.yml diff --git a/html/changelogs/AutoChangeLog-pr-973.yml b/html/changelogs/AutoChangeLog-pr-973.yml new file mode 100644 index 0000000000..b5672ee2f1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-973.yml @@ -0,0 +1,4 @@ +author: MysteryMan21333 +delete-after: true +changes: + - code_imp: Small changes to naming. From 172f5f5701d39d9617038bb2d9de489c6b7dc4b6 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 16 Oct 2023 23:29:44 +0000 Subject: [PATCH 20/20] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-973.yml | 4 ---- html/changelogs/archive/2023-10.yml | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-973.yml diff --git a/html/changelogs/AutoChangeLog-pr-973.yml b/html/changelogs/AutoChangeLog-pr-973.yml deleted file mode 100644 index b5672ee2f1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-973.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: MysteryMan21333 -delete-after: true -changes: - - code_imp: Small changes to naming. diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index 5f9907d373..e8f06cd36d 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -34,6 +34,8 @@ 2023-10-16: AshTheDerg: - rscadd: Added tailbags + MysteryMan21333: + - code_imp: Small changes to naming. Zattarra: - rscadd: Adds holo HUD sunglasses to the game, invisible versions of normal HUD sunglasses.