shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her

Browse Source 
Ports AI console focus loss fix and fixes an error in my trimline code
This commit is contained in:
Putnam3145
2019-11-28 05:37:36 -08:00
committed by GitHub
parent 8cec8fa506 281ddf73ba
commit 09897b4ece
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/machinery/computer/communications.dm
View File

@@ -42,12 +42,6 @@
. = ..()
GLOB.shuttle_caller_list += src
/obj/machinery/computer/communications/process()
if(..())
var/ai_autoupdate = aistate != STATE_STATUSDISPLAY && aistate != STATE_CALLSHUTTLE && aistate != STATE_PURCHASE && aistate != STATE_VIEWMESSAGE
var/machine_user_autoupdate = state != STATE_STATUSDISPLAY && state != STATE_CALLSHUTTLE && state != STATE_PURCHASE && state != STATE_VIEWMESSAGE
updateDialog(machine_user_autoupdate,ai_autoupdate)
/obj/machinery/computer/communications/Topic(href, href_list)
if(..())
return
@@ -586,8 +580,6 @@
popup.set_content(dat)
popup.open()
popup.set_content(dat)
popup.open()
/obj/machinery/computer/communications/proc/get_javascript_header(form_id)
var/dat = {"<script type="text/javascript">

2
code/game/objects/effects/decals/turfdecal/tilecoloring.dm
View File

@@ -234,5 +234,5 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner
icon_state = "trimline_corner_fill"
/obj/effect/turf_decal/trimline/brown/filled/end
/obj/effect/turf_decal/trimline/neutral/filled/end
icon_state = "trimline_end_fill"