mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
TG sync Sunday (#201)
* stage one * datums and shit * game stuff * modules * tgstation.dme * tools * these things for icons * compiling fixes * merge spree on TG * other updates * updated maps with deepfryers * My helpers were not helping
This commit is contained in:
@@ -184,4 +184,4 @@
|
||||
//
|
||||
|
||||
/mob/living/silicon/ai/TurfAdjacent(var/turf/T)
|
||||
return (cameranet && cameranet.checkTurfVis(T))
|
||||
return (cameranet && cameranet.checkTurfVis(T))
|
||||
|
||||
@@ -10,17 +10,6 @@
|
||||
var/mob/living/carbon/alien/humanoid/hunter/AH = usr
|
||||
AH.toggle_leap()
|
||||
|
||||
/obj/screen/alien/nightvision
|
||||
name = "toggle night-vision"
|
||||
icon_state = "nightvision1"
|
||||
screen_loc = ui_alien_nightvision
|
||||
|
||||
/obj/screen/alien/nightvision/Click()
|
||||
var/mob/living/carbon/alien/A = usr
|
||||
var/obj/effect/proc_holder/alien/nightvisiontoggle/T = locate() in A.abilities
|
||||
if(T)
|
||||
T.fire(A)
|
||||
|
||||
/obj/screen/alien/plasma_display
|
||||
icon = 'icons/mob/screen_gen.dmi'
|
||||
icon_state = "power_display2"
|
||||
@@ -105,9 +94,6 @@
|
||||
healths = new /obj/screen/healths/alien()
|
||||
infodisplay += healths
|
||||
|
||||
nightvisionicon = new /obj/screen/alien/nightvision()
|
||||
infodisplay += nightvisionicon
|
||||
|
||||
alien_plasma_display = new /obj/screen/alien/plasma_display()
|
||||
infodisplay += alien_plasma_display
|
||||
|
||||
|
||||
@@ -10,9 +10,6 @@
|
||||
healths = new /obj/screen/healths/alien()
|
||||
infodisplay += healths
|
||||
|
||||
nightvisionicon = new /obj/screen/alien/nightvision()
|
||||
nightvisionicon.screen_loc = ui_alien_nightvision
|
||||
infodisplay += nightvisionicon
|
||||
alien_queen_finder = new /obj/screen/alien/alien_queen_finder()
|
||||
infodisplay += alien_queen_finder
|
||||
pull_icon = new /obj/screen/pull()
|
||||
|
||||
@@ -77,6 +77,8 @@
|
||||
/datum/hud/ghost/show_hud()
|
||||
var/mob/dead/observer/G = mymob
|
||||
mymob.client.screen = list()
|
||||
for(var/thing in plane_masters)
|
||||
mymob.client.screen += plane_masters[thing]
|
||||
create_parallax()
|
||||
if(G.client.prefs.ghost_hud)
|
||||
mymob.client.screen += static_inventory
|
||||
|
||||
@@ -200,9 +200,8 @@
|
||||
if(infodisplay.len)
|
||||
screenmob.client.screen -= infodisplay
|
||||
|
||||
if(plane_masters.len)
|
||||
for(var/thing in plane_masters)
|
||||
screenmob.client.screen += plane_masters[thing]
|
||||
for(var/thing in plane_masters)
|
||||
screenmob.client.screen += plane_masters[thing]
|
||||
hud_version = display_hud_version
|
||||
persistent_inventory_update(screenmob)
|
||||
mymob.update_action_buttons(1)
|
||||
|
||||
@@ -98,7 +98,7 @@ var/const/tk_maxrange = 15
|
||||
/obj/item/tk_grab/attack_self(mob/user)
|
||||
if(!focus)
|
||||
return
|
||||
if(qdeleted(focus))
|
||||
if(QDELETED(focus))
|
||||
qdel(src)
|
||||
return
|
||||
focus.attack_self_tk(user)
|
||||
|
||||
Reference in New Issue
Block a user