cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactors shadekin

Browse Source
This commit is contained in:
Heroman
2019-04-28 15:10:06 +10:00
parent 4a5512c864
commit 703c27da7e
43 changed files with 686 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_onclick/click.dm
View File

@@ -121,6 +121,12 @@
// A is a turf or is on a turf, or in something on a turf (pen in a box); but not something in something on a turf (pen in a box in a backpack)
sdepth = A.storage_depth_turf()
if(isturf(A) || isturf(A.loc) || (sdepth != -1 && sdepth <= 1))
//VOREStation Edit begin: SHADEKIN
var/mob/SK = src
if(istype(SK))
if(SK.shadekin_phasing_check())
return
//VOREStation Edit end: SHADEKIN
if(A.Adjacent(src) || (W && W.attack_can_reach(src, A, W.reach)) ) // see adjacent.dm
if(W)
// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)

3
code/_onclick/hud/ability_screen_objects.dm
View File

@@ -180,7 +180,8 @@
/mob/New()
..()
ability_master = new /obj/screen/movable/ability_master(src)
if(!ability_master) //VOREStation Edit: S H A D E K I N
ability_master = new /obj/screen/movable/ability_master(src)
///////////ACTUAL ABILITIES////////////
//This is what you click to do things//

3
code/_onclick/hud/hud_vr.dm
View File

@@ -1,3 +0,0 @@
var/obj/screen/lingchemdisplay
var/obj/screen/wiz_instability_display