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] 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()