Skip to content

Commit

Permalink
custom rocket description now looks nicer (#6299)
Browse files Browse the repository at this point in the history
# 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:
  • Loading branch information
iloveloopers committed May 18, 2024
1 parent 5da327a commit 23b3fab
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions code/modules/projectiles/magazines/specialist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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]."))
Expand All @@ -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)
Expand All @@ -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()

Expand Down

0 comments on commit 23b3fab

Please sign in to comment.