cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

VS: Fix serveral Destroy()s, VS edition

Browse Source
This commit is contained in:
Arokha Sieyes
2018-02-20 00:21:29 -05:00
parent a75cfe0eb1
commit e3215c98e1
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/login_vr.dm
View File

@@ -4,3 +4,6 @@
if(viewing_alternate_appearances && viewing_alternate_appearances.len) if(viewing_alternate_appearances && viewing_alternate_appearances.len)
for(var/datum/alternate_appearance/AA in viewing_alternate_appearances) for(var/datum/alternate_appearance/AA in viewing_alternate_appearances)
AA.display_to(list(src)) AA.display_to(list(src))
var/obj/screen/plane_master/augmented/aug = plane_holder.plane_masters[VIS_AUGMENTED]
aug.apply()

8
code/modules/mob/mob_planes_vr.dm
View File

@@ -5,7 +5,7 @@
plane_masters[VIS_CH_BACKUP] = new /obj/screen/plane_master{plane = PLANE_CH_BACKUP} //Backup implant status plane_masters[VIS_CH_BACKUP] = new /obj/screen/plane_master{plane = PLANE_CH_BACKUP} //Backup implant status
plane_masters[VIS_CH_VANTAG] = new /obj/screen/plane_master{plane = PLANE_CH_VANTAG} //Vore Antags plane_masters[VIS_CH_VANTAG] = new /obj/screen/plane_master{plane = PLANE_CH_VANTAG} //Vore Antags
plane_masters[VIS_AUGMENTED] = new /obj/screen/plane_master/augmented(null,my_mob) //Augmented reality plane_masters[VIS_AUGMENTED] = new /obj/screen/plane_master/augmented(my_mob) //Augmented reality
///////////////// /////////////////
//AR planemaster does some special image handling //AR planemaster does some special image handling
@@ -14,13 +14,11 @@
var/state = FALSE //Saves cost with the lists var/state = FALSE //Saves cost with the lists
var/mob/my_mob var/mob/my_mob
/obj/screen/plane_master/augmented/New(var/newloc, var/mob/M) /obj/screen/plane_master/augmented/New(var/mob/M)
..(newloc) ..()
my_mob = M my_mob = M
logged_in_event.register(my_mob,src,/obj/screen/plane_master/augmented/proc/apply)
/obj/screen/plane_master/augmented/Destroy() /obj/screen/plane_master/augmented/Destroy()
logged_in_event.unregister(my_mob,src)
my_mob = null my_mob = null
return ..() return ..()

4
code/modules/nifsoft/software/14_commlink.dm
View File

@@ -13,6 +13,10 @@
if((. = ..())) if((. = ..()))
nif.comm = new(nif,src) nif.comm = new(nif,src)
uninstall()
if((. = ..()))
qdel_null(nif.comm)
activate() activate()
if((. = ..())) if((. = ..()))
nif.comm.initialize_exonet(nif.human) nif.comm.initialize_exonet(nif.human)