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

Kills off /obj/item/device (#6561)

Browse Source
This commit is contained in:
kevinz000
2018-04-29 22:06:58 -07:00
committed by Poojawa
parent ab3035a4ea
commit 3369c804b2
538 changed files with 6728 additions and 6707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/necropolis_chests.dm
+25 -25
View File
@@ -14,11 +14,11 @@
var/loot = rand(1,27)
switch(loot)
if(1)
new /obj/item/device/shared_storage/red(src)
new /obj/item/shared_storage/red(src)
if(2)
new /obj/item/clothing/suit/space/hardsuit/cult(src)
if(3)
new /obj/item/device/soulstone/anybody(src)
new /obj/item/soulstone/anybody(src)
if(4)
new /obj/item/katana/cursed(src)
if(5)
@@ -54,11 +54,11 @@
else
new /obj/item/disk/design_disk/modkit_disc/bounty(src)
if(18)
new /obj/item/device/warp_cube/red(src)
new /obj/item/warp_cube/red(src)
if(19)
new /obj/item/device/wisp_lantern(src)
new /obj/item/wisp_lantern(src)
if(20)
new /obj/item/device/immortality_talisman(src)
new /obj/item/immortality_talisman(src)
if(21)
new /obj/item/gun/magic/hook(src)
if(22)
@@ -193,7 +193,7 @@
activated = TRUE
//Wisp Lantern
/obj/item/device/wisp_lantern
/obj/item/wisp_lantern
name = "spooky lantern"
desc = "This lantern gives off no light, but is home to a friendly wisp."
icon = 'icons/obj/lighting.dmi'
@@ -203,7 +203,7 @@
righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
var/obj/effect/wisp/wisp
/obj/item/device/wisp_lantern/attack_self(mob/user)
/obj/item/wisp_lantern/attack_self(mob/user)
if(!wisp)
to_chat(user, "<span class='warning'>The wisp has gone missing!</span>")
return
@@ -229,11 +229,11 @@
icon_state = "lantern-blue"
SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
/obj/item/device/wisp_lantern/Initialize()
/obj/item/wisp_lantern/Initialize()
. = ..()
wisp = new(src)
/obj/item/device/wisp_lantern/Destroy()
/obj/item/wisp_lantern/Destroy()
if(wisp)
if(wisp.loc == src)
qdel(wisp)
@@ -250,16 +250,16 @@
layer = ABOVE_ALL_MOB_LAYER
//Red/Blue Cubes
/obj/item/device/warp_cube
/obj/item/warp_cube
name = "blue cube"
desc = "A mysterious blue cube."
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "blue_cube"
var/teleport_color = "#3FBAFD"
var/obj/item/device/warp_cube/linked
var/obj/item/warp_cube/linked
var/teleporting = FALSE
/obj/item/device/warp_cube/attack_self(mob/user)
/obj/item/warp_cube/attack_self(mob/user)
if(!linked)
to_chat(user, "[src] fizzles uselessly.")
return
@@ -292,16 +292,16 @@
user.forceMove(get_turf(link_holder))
qdel(link_holder)
/obj/item/device/warp_cube/red
/obj/item/warp_cube/red
name = "red cube"
desc = "A mysterious red cube."
icon_state = "red_cube"
teleport_color = "#FD3F48"
/obj/item/device/warp_cube/red/Initialize()
/obj/item/warp_cube/red/Initialize()
. = ..()
if(!linked)
var/obj/item/device/warp_cube/blue = new(src.loc)
var/obj/item/warp_cube/blue = new(src.loc)
linked = blue
blue.linked = src
@@ -367,7 +367,7 @@
//Immortality Talisman
/obj/item/device/immortality_talisman
/obj/item/immortality_talisman
name = "Immortality Talisman"
desc = "A dread talisman that can render you completely invulnerable."
icon = 'icons/obj/lavaland/artefacts.dmi'
@@ -375,20 +375,20 @@
actions_types = list(/datum/action/item_action/immortality)
var/cooldown = 0
/obj/item/device/immortality_talisman/Initialize()
/obj/item/immortality_talisman/Initialize()
. = ..()
AddComponent(/datum/component/anti_magic, TRUE, TRUE)
/datum/action/item_action/immortality
name = "Immortality"
/obj/item/device/immortality_talisman/Destroy(force)
/obj/item/immortality_talisman/Destroy(force)
if(force)
. = ..()
else
return QDEL_HINT_LETMELIVE
/obj/item/device/immortality_talisman/attack_self(mob/user)
/obj/item/immortality_talisman/attack_self(mob/user)
if(cooldown < world.time)
SSblackbox.record_feedback("amount", "immortality_talisman_uses", 1)
cooldown = world.time + 600
@@ -402,7 +402,7 @@
user.status_flags |= GODMODE
addtimer(CALLBACK(src, .proc/return_to_reality, user, Z), 100)
/obj/item/device/immortality_talisman/proc/return_to_reality(mob/user, obj/effect/immortality_talisman/Z)
/obj/item/immortality_talisman/proc/return_to_reality(mob/user, obj/effect/immortality_talisman/Z)
user.status_flags &= ~GODMODE
user.notransform = 0
user.forceMove(get_turf(Z))
@@ -433,7 +433,7 @@
//Shared Bag
/obj/item/device/shared_storage
/obj/item/shared_storage
name = "paradox bag"
desc = "Somehow, it's in two places at once."
icon = 'icons/obj/storage.dmi'
@@ -441,19 +441,19 @@
slot_flags = SLOT_BACK
resistance_flags = INDESTRUCTIBLE
/obj/item/device/shared_storage/red
/obj/item/shared_storage/red
name = "paradox bag"
desc = "Somehow, it's in two places at once."
/obj/item/device/shared_storage/red/Initialize()
/obj/item/shared_storage/red/Initialize()
. = ..()
var/datum/component/storage/STR = AddComponent(/datum/component/storage/concrete)
STR.max_w_class = WEIGHT_CLASS_NORMAL
STR.max_combined_w_class = 60
STR.max_items = 21
new /obj/item/device/shared_storage/blue(drop_location(), STR)
new /obj/item/shared_storage/blue(drop_location(), STR)
/obj/item/device/shared_storage/blue/Initialize(mapload, datum/component/storage/concrete/master)
/obj/item/shared_storage/blue/Initialize(mapload, datum/component/storage/concrete/master)
. = ..()
if(!istype(master))
return INITIALIZE_HINT_QDEL