cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Using a soulstone on a construct shell no longer destroys it and the shade if no option is taken. Plus code improvement (#7928)

Browse Source 
* Using a soulstone on a construct shell no longer destroys it and the shade if no option is taken. Plus code improvement

* Fixed the merge conflicts.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-09-03 20:31:43 -04:00
committed by GitHub
co-authored by Ghom GoldenAlpharex
parent fa9916dd20
commit 98ee0b19e5
5 changed files with 89 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic/revolver.dm
+4 -4
View File
@@ -263,10 +263,10 @@
desc = "To play with this revolver requires wagering your very soul."
/obj/item/gun/ballistic/revolver/russian/soul/shoot_self(mob/living/user)
..()
var/obj/item/soulstone/anybody/revolver/SS = new /obj/item/soulstone/anybody/revolver(get_turf(src))
if(!SS.transfer_soul("FORCE", user)) //Something went wrong
qdel(SS)
. = ..()
var/obj/item/soulstone/anybody/revolver/stone = new /obj/item/soulstone/anybody/revolver(get_turf(src))
if(!stone.capture_soul(user, forced = TRUE)) //Something went wrong
qdel(stone)
return
user.visible_message(span_danger("[user.name]'s soul is captured by \the [src]!"), span_userdanger("You've lost the gamble! Your soul is forfeit!"))