Merge pull request #5581 from Anewbe/mining_toys

Technically adds the Ore Redemption Machine
This commit is contained in:
Atermonera
2018-09-22 13:38:10 -07:00
committed by GitHub
16 changed files with 497 additions and 2 deletions
@@ -0,0 +1,46 @@
/obj/effect/temp_visual/decoy
desc = "It's a decoy!"
duration = 15
/obj/effect/temp_visual/decoy/initialize(mapload, atom/mimiced_atom, var/customappearance)
. = ..()
alpha = initial(alpha)
if(mimiced_atom)
name = mimiced_atom.name
appearance = mimiced_atom.appearance
set_dir(mimiced_atom.dir)
mouse_opacity = 0
if(customappearance)
appearance = customappearance
/obj/effect/temp_visual/decoy/fading/initialize(mapload, atom/mimiced_atom)
. = ..()
animate(src, alpha = 0, time = duration)
/obj/effect/temp_visual/decoy/fading/fivesecond
duration = 50
/obj/effect/temp_visual/small_smoke
icon_state = "smoke"
duration = 50
// VOREStation Add - Used by Kinetic Accelerator
/obj/effect/temp_visual/kinetic_blast
name = "kinetic explosion"
icon = 'icons/obj/projectiles.dmi'
icon_state = "kinetic_blast"
layer = ABOVE_MOB_LAYER
duration = 4
/obj/effect/temp_visual/explosion
name = "explosion"
icon = 'icons/effects/96x96.dmi'
icon_state = "explosion"
pixel_x = -32
pixel_y = -32
duration = 8
/obj/effect/temp_visual/explosion/fast
icon_state = "explosionfast"
duration = 4
// VOREStation Add End
@@ -0,0 +1,36 @@
//temporary visual effects
/obj/effect/temp_visual
icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
anchored = TRUE
layer = ABOVE_MOB_LAYER
mouse_opacity = 0
var/duration = 10 //in deciseconds
var/randomdir = TRUE
/obj/effect/temp_visual/initialize()
. = ..()
if(randomdir)
set_dir(pick(cardinal))
spawn(duration)
qdel(src)
/obj/effect/temp_visual/singularity_act()
return
/obj/effect/temp_visual/singularity_pull()
return
/obj/effect/temp_visual/ex_act()
return
/*
/obj/effect/temp_visual/dir_setting
randomdir = FALSE
/obj/effect/temp_visual/dir_setting/Initialize(mapload, set_dir)
if(set_dir)
setDir(set_dir)
. = ..()
*/ //More tg stuff that might be useful later
+7
View File
@@ -111,6 +111,13 @@
src.loc = null
return ..()
// Check if target is reasonable for us to operate on.
/obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)
if(((src in target) && !target_self) || ((!istype(target.loc, /turf)) && (!istype(target, /turf)) && (not_inside)))
return FALSE
else
return TRUE
/obj/item/proc/update_twohanding()
update_held_icon()
@@ -30,6 +30,8 @@
var/rank = null //actual job
var/dorm = 0 // determines if this ID has claimed a dorm already
var/mining_points = 0 // For redeeming at mining equipment vendors
/obj/item/weapon/card/id/examine(mob/user)
set src in oview(1)
if(in_range(usr, src))