Merge pull request #14372 from Cyantime/patch-2

Fixes #14331
This commit is contained in:
Novacat
2023-01-23 09:32:14 -05:00
committed by CHOMPStation2
parent 0e84267ffd
commit d2925a1d2d

View File

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