mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
The 515 MegaPR early downport (#7783)
Co-authored-by: Selis <selis@xynolabs.com> Co-authored-by: Selis <sirlionfur@hotmail.de> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: SatinIsle <thesatinisle@gmail.com> Co-authored-by: Heroman <alesha3000@list.ru> Co-authored-by: Casey <a.roaming.shadow@gmail.com> Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
@@ -183,6 +183,13 @@
|
||||
if(!ability_master) //VOREStation Edit: S H A D E K I N
|
||||
ability_master = new /obj/screen/movable/ability_master(src)
|
||||
|
||||
|
||||
/mob/Destroy()
|
||||
..()
|
||||
if(ability_master)
|
||||
QDEL_NULL(ability_master)
|
||||
|
||||
|
||||
///////////ACTUAL ABILITIES////////////
|
||||
//This is what you click to do things//
|
||||
///////////////////////////////////////
|
||||
@@ -383,4 +390,4 @@
|
||||
A.name = object_given.name
|
||||
ability_objects.Add(A)
|
||||
if(my_mob.client)
|
||||
toggle_open(2) //forces the icons to refresh on screen
|
||||
toggle_open(2) //forces the icons to refresh on screen
|
||||
|
||||
@@ -24,7 +24,8 @@
|
||||
ManualFollow(A)
|
||||
// Otherwise jump
|
||||
else
|
||||
following = null
|
||||
if(following)
|
||||
stop_following()
|
||||
forceMove(get_turf(A))
|
||||
|
||||
/mob/observer/dead/ClickOn(var/atom/A, var/params)
|
||||
@@ -68,9 +69,9 @@
|
||||
|
||||
// VOREStation Edit Begin
|
||||
|
||||
/obj/machinery/gateway/centerstation/attack_ghost(mob/user as mob)
|
||||
if(awaygate)
|
||||
if(user.client.holder)
|
||||
/obj/machinery/gateway/centerstation/attack_ghost(mob/user as mob)
|
||||
if(awaygate)
|
||||
if(user.client.holder)
|
||||
user.loc = awaygate.loc
|
||||
else if(active)
|
||||
user.loc = awaygate.loc
|
||||
|
||||
Reference in New Issue
Block a user