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

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

Browse Source
This commit is contained in:
LatD
2016-05-26 19:02:46 +03:00
parent ac11d35ea2 fd2d5e7002
commit a6680b9f06
109 changed files with 6508 additions and 1753 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/necropolis_chests.dm
+8 -5
View File
@@ -212,8 +212,11 @@
icon_state = "talisman"
var/cooldown = 0
/obj/item/device/immortality_talisman/Destroy()
return QDEL_HINT_LETMELIVE
/obj/item/device/immortality_talisman/Destroy(force)
if(force)
. = ..()
else
return QDEL_HINT_LETMELIVE
/obj/item/device/immortality_talisman/attack_self(mob/user)
if(cooldown < world.time)
@@ -250,11 +253,11 @@
/obj/effect/immortality_talisman/singularity_pull()
return 0
/obj/effect/immortality_talisman/Destroy()
if(!can_destroy)
/obj/effect/immortality_talisman/Destroy(force)
if(!can_destroy && !force)
return QDEL_HINT_LETMELIVE
else
..()
. = ..()
//Shared Bag