From 23b3fab17bc04f874779db266dbf9ddb92fffc83 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sat, 18 May 2024 00:24:55 -0400 Subject: [PATCH 1/4] custom rocket description now looks nicer (#6299) # About the pull request new desc: ![newrocketdesc](https://github.com/cmss13-devs/cmss13/assets/140007537/8ea6b226-f392-4579-a13e-e5d47ea93acd) # Explain why it's good for the game looks nicer # Testing Photographs and Procedure it works # Changelog :cl: spellcheck: Custom rocket description now looks nicer /:cl: --- code/modules/projectiles/magazines/specialist.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/magazines/specialist.dm b/code/modules/projectiles/magazines/specialist.dm index 698d9efeaca2..547d231e1c69 100644 --- a/code/modules/projectiles/magazines/specialist.dm +++ b/code/modules/projectiles/magazines/specialist.dm @@ -254,10 +254,16 @@ user.put_in_hands(fuel) fuel = null update_icon() - desc = initial(desc) + "\n Contains[fuel?" fuel":""] [warhead?" and warhead":""]." return . = ..() +/obj/item/ammo_magazine/rocket/custom/get_examine_text(mob/user) + . = ..() + if(fuel) + . += SPAN_NOTICE("Contains fuel.") + if(warhead) + . += SPAN_NOTICE("Contains a warhead.") + /obj/item/ammo_magazine/rocket/custom/attackby(obj/item/W as obj, mob/user as mob) if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You do not know how to tinker with [name].")) @@ -284,7 +290,6 @@ W.forceMove(src) fuel = W to_chat(user, SPAN_DANGER("You add [W] to [name].")) - desc = initial(desc) + "\n Contains[fuel?" fuel":""] [warhead?" and warhead":""]." playsound(loc, 'sound/items/Screwdriver2.ogg', 25, 0, 6) else if(istype(W,/obj/item/explosive/warhead/rocket) && !locked) if(warhead) @@ -298,7 +303,6 @@ W.forceMove(src) warhead = W to_chat(user, SPAN_DANGER("You add [W] to [name].")) - desc = initial(desc) + "\n Contains[fuel?" fuel":""] [warhead?" and warhead":""]." playsound(loc, 'sound/items/Screwdriver2.ogg', 25, 0, 6) update_icon() From 344949fe0870e520a09883fa6b232dc71d744a87 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 18 May 2024 05:32:15 +0100 Subject: [PATCH 2/4] Automatic changelog for PR #6299 [ci skip] --- html/changelogs/AutoChangeLog-pr-6299.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6299.yml diff --git a/html/changelogs/AutoChangeLog-pr-6299.yml b/html/changelogs/AutoChangeLog-pr-6299.yml new file mode 100644 index 000000000000..d529a8eac958 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6299.yml @@ -0,0 +1,4 @@ +author: "iloveloopers" +delete-after: True +changes: + - spellcheck: "Custom rocket description now looks nicer" \ No newline at end of file From 70452912d3796c13020108e592fff59d7d08e1b7 Mon Sep 17 00:00:00 2001 From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com> Date: Sat, 18 May 2024 07:25:05 +0300 Subject: [PATCH 3/4] Changes advanced medhud eye location (#6294) # About the pull request For some reason advanced medhud is displayed on a different eye, which is also extremely ugly looking and has little options to cover up # Explain why it's good for the game The sprites for it look bad and there are few props you can stack ontop of it to make it look better as opposed to the other eye # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Changed advanced medhud visor to be displayed on the same eye as normal medhud visor /:cl: --- code/game/objects/items/devices/helmet_visors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/helmet_visors.dm b/code/game/objects/items/devices/helmet_visors.dm index 0b5c5d296c39..8f921a62f3f5 100644 --- a/code/game/objects/items/devices/helmet_visors.dm +++ b/code/game/objects/items/devices/helmet_visors.dm @@ -82,7 +82,7 @@ /obj/item/device/helmet_visor/medical/advanced name = "advanced medical optic" - helmet_overlay = "med_sight_left" + helmet_overlay = "med_sight_right" /obj/item/device/helmet_visor/medical/advanced/activate_visor(obj/item/clothing/head/helmet/marine/attached_helmet, mob/living/carbon/human/user) . = ..() From bc5971271b673ad391122fb911f438d5925950a2 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Sat, 18 May 2024 05:39:39 +0100 Subject: [PATCH 4/4] Automatic changelog for PR #6294 [ci skip] --- html/changelogs/AutoChangeLog-pr-6294.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-6294.yml diff --git a/html/changelogs/AutoChangeLog-pr-6294.yml b/html/changelogs/AutoChangeLog-pr-6294.yml new file mode 100644 index 000000000000..cfb0804f052e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6294.yml @@ -0,0 +1,4 @@ +author: "Git-Nivrak" +delete-after: True +changes: + - rscadd: "Changed advanced medhud visor to be displayed on the same eye as normal medhud visor" \ No newline at end of file