cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3871 from Tastyfish/chronx2

Browse Source 
fluff tweaks
This commit is contained in:
Fox McCloud
2016-03-15 11:17:15 -04:00
parent 88f3f3e96a 96e0d10f8e
commit 6dfbcb5dcc
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/weaponry.dm
+1 -1
View File
@@ -28,7 +28,7 @@
w_class = 1
var/transformed = 0
var/transform_into = /obj/item/weapon/nullrod/sword
var/transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar)
var/transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar, /obj/item/clothing/suit/chaplain_hoodie/fluff/chronx)
suicide_act(mob/user)
viewers(user) << "<span class='suicide'>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>"
code/modules/customitems/item_defines.dm
+1 -4
View File
@@ -285,7 +285,6 @@
/obj/item/weapon/nullrod/fluff/chronx //chronx100: Hughe O'Splash
transform_into = /obj/item/weapon/nullrod/sword/fluff/chronx
transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar, /obj/item/clothing/suit/chaplain_hoodie/fluff/chronx)
/obj/item/weapon/nullrod/sword/fluff/chronx
name = "Soul Collector"
@@ -311,9 +310,7 @@
set name = "Transform Hood"
set category = "Object"
set src in usr
if(!isliving(src))
return
if(!usr.incapacitated())
if(isliving(usr) && !usr.incapacitated())
if(adjusted)
icon_state = initial(icon_state)
item_state = initial(item_state)