shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32456 from vuonojenmustaturska/ghostmemes

Browse Source 
[s] Removes a handful of ways ghosts can affect the world
This commit is contained in:
oranges
2017-11-06 21:48:42 -06:00
committed by CitadelStationBot
parent 326d0bd29b
commit 1068b8f22d
5 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/twohanded.dm
+9 -9
View File
@@ -457,15 +457,15 @@
explosive.prime()
qdel(src)
/obj/item/twohanded/spear/AltClick()
..()
if(!explosive)
return
if(ismob(loc))
var/mob/M = loc
var/input = stripped_input(M,"What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50)
if(input)
src.war_cry = input
/obj/item/twohanded/spear/AltClick(mob/user)
if(user.canUseTopic(src, be_close=TRUE))
..()
if(!explosive)
return
if(istype(user) && loc == user)
var/input = stripped_input(user,"What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50)
if(input)
src.war_cry = input
/obj/item/twohanded/spear/CheckParts(list/parts_list)
var/obj/item/twohanded/spear/S = locate() in parts_list