cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14372 from Cyantime/patch-2

Browse Source 
Fixes #14331
This commit is contained in:
Novacat
2023-01-23 09:32:14 -05:00
committed by CHOMPStation2
parent 0e84267ffd
commit d2925a1d2d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/fireworks/firework_launcher.dm
View File

@@ -46,13 +46,15 @@
return return
if(istype(O, /obj/item/weapon/firework_star)) if(istype(O, /obj/item/weapon/firework_star))
loaded_star = O if(loaded_star)
user.drop_item() to_chat(user, SPAN_NOTICE("\The [src] already has \a [loaded_star] inside, unload it first!"))
O.forceMove(src) return
to_chat(user, "<span class='notice'>You insert the firework star into the launcher.</span>") if(user.unEquip(O, 0, src))
add_fingerprint(user) loaded_star = O
update_icon() to_chat(user, "<span class='notice'>You insert the firework star into the launcher.</span>")
return add_fingerprint(user)
update_icon()
return
return ..() return ..()
@@ -121,4 +123,4 @@
var/datum/planet/P = SSplanets.z_to_planet[T.z] var/datum/planet/P = SSplanets.z_to_planet[T.z]
if(!P) if(!P)
return return
return P return P