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

Fixes dupe and runtime issues with Rod of Asclepius (#36410)

Browse Source 
* Fixes bug with duplicating rod on removal while lying down, as well as implemented a new force_put_in_hand() proc, and cleaned up some code.

* Merged force_put_in_hand() with put_in_hand() and cleaned up code.
This commit is contained in:
TheDreamweaver
2018-03-17 06:21:48 -07:00
committed by CitadelStationBot
parent 13709a7d34
commit 49a772b6b7
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/status_effects/buffs.dm
+3 -7
View File
@@ -501,19 +501,15 @@
if(((hand % 2) == 0))
var/obj/item/bodypart/L = itemUser.newBodyPart("r_arm", FALSE, FALSE)
L.attach_limb(itemUser)
itemUser.put_in_r_hand(newRod)
itemUser.put_in_hand(newRod, hand, forced = TRUE)
else
var/obj/item/bodypart/L = itemUser.newBodyPart("l_arm", FALSE, FALSE)
L.attach_limb(itemUser)
itemUser.put_in_l_hand(newRod)
itemUser.put_in_hand(newRod, hand, forced = TRUE)
to_chat(itemUser, "<span class='notice'>Your arm suddenly grows back with the Rod of Asclepius still attached!</span>")
else
//Otherwise get rid of whatever else is in their hand and return the rod to said hand
itemUser.dropItemToGround(itemUser.get_item_for_held_index(hand))
if(((hand % 2) == 0))
itemUser.put_in_r_hand(newRod)
else
itemUser.put_in_l_hand(newRod)
itemUser.put_in_hand(newRod, hand, forced = TRUE)
to_chat(itemUser, "<span class='notice'>The Rod of Asclepius suddenly grows back out of your arm!</span>")
//Because a servant of medicines stops at nothing to help others, lets keep them on their toes and give them an additional boost.
if(itemUser.health < itemUser.maxHealth)