mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-18 22:22:09 +00:00
715de43f35
* Better notifications * Add buttons to del/move tabs in edit mode * Add a <span> to emotes * Fix duplicate IDs in VChat and add more logging * VChat: Redone chat output in Vue.js * Ported tg asset cache * VChat DME Update * Replace \image macro with bicon() * NanoUI Subsystem Fixes Don't do this, the asset subsystem does this for you * Allow narrate/globalnarrate shenanigans Allows HTML if your entire thing is HTML * Disable bicon() icon object cache, and create text tag cache * Ore Scanner is written incorrectly Only revealed by vchat * Fixes 2 VChat bugs * Underline links in VChat * Fix LOOC color * VChat Improvements Hopefully, anyway. - Arbitrary font size setting - Line height setting - Multiple crush settings - Rewrote how tabs work hopefully for performance - Hidden messages are actually put elsewhere - Attempts to correct chat backlog restore on rejoin * Surgery steps to use <span> * Some VChat Tweaks - Chat remains between client reconnects if your client didn't close (so things like using the reconnect button, or autoreconnects at round end when that feels like working) - The client doesn't send pings to the server, the server sends pings to the client. This fixes AFK measurements for AFK kick purposes. - Turn latency indicator into a green/red indicator to show if you're connected, and when clicked will perform a one-time ping (and block doing it again for 10 seconds). It will display '?ms' if it never got a reply, or '999ms' if it did, but it was over 1s. * Include date in filename for VChat log save * Merge pull request #6767 from Cyantime/patch-2 Change chat export naming scheme * Adds VChat tab saving Saves every time you enter/exit edit mode. Persists between rounds, VChat reloads via verb, etc. * Fix chat exporting when someone has used unicode Only affects clients still using 512 * Use CLIENT_FROM_VAR for ease of code reading * Update code/modules/client/asset_cache.dm Co-Authored-By: Novacat <35587478+Novacat@users.noreply.github.com> * Fix runtime when client disconnects before vchat loads * Fix polaris version of command reports * Fix LOOC color in oldchat * Put some styles in various adminpm messages * Round info and advanced who spans * Fix missing tag-end * Maybe fix images for linux and statpanel but also doom everyone Co-authored-by: ShadowLarkens <ShadowLarkens@users.noreply.github.com> Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
335 lines
7.1 KiB
Plaintext
335 lines
7.1 KiB
Plaintext
//#define AMAP
|
|
/obj/machinery/computer/security/verb/station_map()
|
|
set name = ".map"
|
|
set category = "Object"
|
|
set src in view(1)
|
|
usr.set_machine(src)
|
|
if(!mapping) return
|
|
log_game("[usr]([usr.key]) used station map L[z] in [src.loc.loc]")
|
|
drawmap(usr)
|
|
|
|
/obj/machinery/computer/security/proc/drawmap(var/mob/user as mob)
|
|
|
|
var/icx = round(world.maxx/16) + 1
|
|
var/icy = round(world.maxy/16) + 1
|
|
|
|
var/xoff = round((icx*16-world.maxx)-2)
|
|
var/yoff = round((icy*16-world.maxy)-2)
|
|
|
|
var/icount = icx * icy
|
|
|
|
var/list/imap = list()
|
|
|
|
#ifdef AMAP
|
|
|
|
for(var/i = 0; i<icount; i++)
|
|
imap += icon('icons/misc/imap.dmi', "blank")
|
|
imap += icon('icons/misc/imap.dmi', "blank")
|
|
|
|
//to_world("[icount] images in list")
|
|
|
|
for(var/wx = 1 ; wx <= world.maxx; wx++)
|
|
|
|
for(var/wy = 1; wy <= world.maxy; wy++)
|
|
|
|
var/turf/T = locate(wx, wy, z)
|
|
|
|
var/colour
|
|
var/colour2
|
|
|
|
if(!T)
|
|
colour = rgb(0,0,0)
|
|
|
|
else
|
|
var/sense = 1
|
|
switch("[T.type]")
|
|
if("/turf/space")
|
|
colour = rgb(10,10,10)
|
|
sense = 0
|
|
|
|
if("/turf/simulated/floor")
|
|
colour = rgb(150,150,150)
|
|
var/turf/simulated/floor/TF = T
|
|
if(TF.burnt == 1)
|
|
sense = 0
|
|
colour = rgb(130,130,130)
|
|
|
|
if("/turf/simulated/floor/reinforced")
|
|
colour = rgb(128,128,128)
|
|
|
|
if("/turf/simulated/wall")
|
|
colour = rgb(96,96,96)
|
|
|
|
if("/turf/simulated/wall/r_wall")
|
|
colour = rgb(128,96,96)
|
|
|
|
if("/turf/unsimulated/floor")
|
|
colour = rgb(240,240,240)
|
|
|
|
if("/turf/unsimulated/wall", "/turf/unsimulated/wall/other")
|
|
colour = rgb(140,140,140)
|
|
|
|
else
|
|
colour = rgb(0,40,0)
|
|
|
|
if(sense)
|
|
|
|
for(var/atom/AM in T.contents)
|
|
|
|
if(istype(AM, /obj/machinery/door) && !istype(AM, /obj/machinery/door/window))
|
|
if(AM.density)
|
|
colour = rgb(96,96,192)
|
|
colour2 = colour
|
|
else
|
|
colour = rgb(128,192,128)
|
|
|
|
if(istype(AM, /obj/machinery/alarm))
|
|
colour = rgb(0,255,0)
|
|
colour2 = colour
|
|
if(AM.icon_state=="alarm:1")
|
|
colour = rgb(255,255,0)
|
|
colour2 = rgb(255,128,0)
|
|
|
|
if(istype(AM, /mob))
|
|
if(AM:client)
|
|
colour = rgb(255,0,0)
|
|
else
|
|
colour = rgb(255,128,128)
|
|
|
|
colour2 = rgb(192,0,0)
|
|
|
|
var/area/A = T.loc
|
|
|
|
if(A.fire)
|
|
|
|
var/red = getr(colour)
|
|
var/green = getg(colour)
|
|
var/blue = getb(colour)
|
|
|
|
|
|
green = min(255, green+40)
|
|
blue = min(255, blue+40)
|
|
|
|
colour = rgb(red, green, blue)
|
|
|
|
if(!colour2 && !T.density)
|
|
var/datum/gas_mixture/environment = T.return_air()
|
|
var/turf_total = environment.total_moles()
|
|
//var/turf_total = T.co2 + T.oxygen + T.poison + T.sl_gas + T.n2
|
|
|
|
var/t1 = turf_total / MOLES_CELLSTANDARD * 150
|
|
|
|
if(t1<=100)
|
|
colour2 = rgb(t1*2.55,0,0)
|
|
else
|
|
t1 = min(100, t1-100)
|
|
colour2 = rgb(255, t1*2.55, t1*2.55)
|
|
|
|
if(!colour2)
|
|
colour2 = colour
|
|
|
|
var/ix = round((wx*2+xoff)/32)
|
|
var/iy = round((wy*2+yoff)/32)
|
|
|
|
var/rx = ((wx*2+xoff)%32) + 1
|
|
var/ry = ((wy*2+yoff)%32) + 1
|
|
|
|
//to_world("trying [ix],[iy] : [ix+icx*iy]")
|
|
var/icon/I = imap[1+(ix + icx*iy)*2]
|
|
var/icon/I2 = imap[2+(ix + icx*iy)*2]
|
|
|
|
//to_world("icon: [bicon(I)]")
|
|
|
|
I.DrawBox(colour, rx, ry, rx+1, ry+1)
|
|
|
|
I2.DrawBox(colour2, rx, ry, rx+1, ry+1)
|
|
|
|
user.clearmap()
|
|
|
|
user.mapobjs = list()
|
|
|
|
for(var/i=0; i<icount;i++)
|
|
var/obj/screen/H = new /obj/screen()
|
|
|
|
H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]"
|
|
|
|
//to_world("[bicon(I)] at [H.screen_loc]")
|
|
|
|
H.name = (i==0)?"maprefresh":"map"
|
|
|
|
var/icon/HI = new/icon
|
|
|
|
var/icon/I = imap[i*2+1]
|
|
var/icon/J = imap[i*2+2]
|
|
|
|
HI.Insert(I, frame=1, delay = 5)
|
|
HI.Insert(J, frame=2, delay = 5)
|
|
|
|
qdel(I)
|
|
qdel(J)
|
|
H.icon = HI
|
|
H.hud_layerise()
|
|
usr.mapobjs += H
|
|
#else
|
|
|
|
for(var/i = 0; i<icount; i++)
|
|
imap += icon('icons/misc/imap.dmi', "blank")
|
|
|
|
for(var/wx = 1 ; wx <= world.maxx; wx++)
|
|
|
|
for(var/wy = 1; wy <= world.maxy; wy++)
|
|
|
|
var/turf/T = locate(wx, wy, z)
|
|
|
|
var/colour
|
|
|
|
if(!T)
|
|
colour = rgb(0,0,0)
|
|
|
|
else
|
|
var/sense = 1
|
|
switch("[T.type]")
|
|
if("/turf/space")
|
|
colour = rgb(10,10,10)
|
|
sense = 0
|
|
|
|
if("/turf/simulated/floor/tiled", "/turf/simulated/floor/reinforced")
|
|
var/datum/gas_mixture/environment = T.return_air()
|
|
var/turf_total = environment.total_moles
|
|
var/t1 = turf_total / MOLES_CELLSTANDARD * 175
|
|
|
|
if(t1<=100)
|
|
colour = rgb(0,0,t1*2.55)
|
|
else
|
|
t1 = min(100, t1-100)
|
|
colour = rgb(t1*2.55, t1*2.55, 255)
|
|
|
|
if("/turf/simulated/wall")
|
|
colour = rgb(96,96,96)
|
|
|
|
if("/turf/simulated/wall/r_wall")
|
|
colour = rgb(128,96,96)
|
|
|
|
if("/turf/unsimulated/floor")
|
|
colour = rgb(240,240,240)
|
|
|
|
if("/turf/unsimulated/wall", "/turf/unsimulated/wall/other")
|
|
colour = rgb(140,140,140)
|
|
|
|
else
|
|
colour = rgb(0,40,0)
|
|
|
|
if(sense)
|
|
|
|
for(var/atom/AM in T.contents)
|
|
|
|
if(istype(AM, /obj/machinery/door) && !istype(AM, /obj/machinery/door/window))
|
|
if(AM.density)
|
|
colour = rgb(0,96,192)
|
|
else
|
|
colour = rgb(96,192,128)
|
|
|
|
if(istype(AM, /obj/machinery/alarm))
|
|
colour = rgb(0,255,0)
|
|
|
|
if(AM.icon_state=="alarm:1")
|
|
colour = rgb(255,255,0)
|
|
|
|
if(istype(AM, /mob))
|
|
if(AM:client)
|
|
colour = rgb(255,0,0)
|
|
else
|
|
colour = rgb(255,128,128)
|
|
|
|
//if(istype(AM, /obj/effect/blob))
|
|
// colour = rgb(255,0,255)
|
|
|
|
var/area/A = T.loc
|
|
|
|
if(A.fire)
|
|
|
|
var/red = getr(colour)
|
|
var/green = getg(colour)
|
|
var/blue = getb(colour)
|
|
|
|
green = min(255, green+40)
|
|
blue = min(255, blue+40)
|
|
|
|
colour = rgb(red, green, blue)
|
|
|
|
var/ix = round((wx*2+xoff)/32)
|
|
var/iy = round((wy*2+yoff)/32)
|
|
|
|
var/rx = ((wx*2+xoff)%32) + 1
|
|
var/ry = ((wy*2+yoff)%32) + 1
|
|
|
|
//to_world("trying [ix],[iy] : [ix+icx*iy]")
|
|
var/icon/I = imap[1+(ix + icx*iy)]
|
|
|
|
//to_world("icon: [bicon(I)]")
|
|
|
|
I.DrawBox(colour, rx, ry, rx, ry)
|
|
|
|
user.clearmap()
|
|
|
|
user.mapobjs = list()
|
|
|
|
for(var/i=0; i<icount;i++)
|
|
var/obj/screen/H = new /obj/screen()
|
|
|
|
H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]"
|
|
|
|
//to_world("[bicon(I)] at [H.screen_loc]")
|
|
|
|
H.name = (i==0)?"maprefresh":"map"
|
|
|
|
var/icon/I = imap[i+1]
|
|
|
|
H.icon = I
|
|
qdel(I)
|
|
H.hud_layerise()
|
|
usr.mapobjs += H
|
|
|
|
#endif
|
|
|
|
user.client.screen += user.mapobjs
|
|
|
|
src.close(user)
|
|
|
|
/* if(seccomp == src)
|
|
drawmap(user)
|
|
else
|
|
user.clearmap()*/
|
|
return
|
|
|
|
/obj/machinery/computer/security/proc/close(mob/user)
|
|
spawn(20)
|
|
var/using = null
|
|
if(user.mapobjs)
|
|
for(var/obj/machinery/computer/security/seccomp in oview(1,user))
|
|
if(seccomp == src)
|
|
using = 1
|
|
break
|
|
if(using)
|
|
close(user)
|
|
else
|
|
user.clearmap()
|
|
|
|
return
|
|
|
|
proc/getr(col)
|
|
return hex2num(copytext(col, 2,4))
|
|
|
|
proc/getg(col)
|
|
return hex2num(copytext(col, 4,6))
|
|
|
|
proc/getb(col)
|
|
return hex2num(copytext(col, 6))
|
|
|
|
/mob/proc/clearmap()
|
|
src.client.screen -= src.mapobjs
|
|
for(var/obj/screen/O in mapobjs)
|
|
qdel(O)
|
|
|
|
mapobjs = null
|
|
src.unset_machine() |