cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove eroneous code; click catcher define; bygex path fix

Browse Source
This commit is contained in:
Bjorn Neergaard
2016-02-02 17:46:07 -06:00
parent ef19e7904f
commit a5f09e103e
6 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__HELPERS/510.dm
View File

@@ -1,6 +1,6 @@
// Helpers for running 510 code on older versions of BYOND. // Helpers for running 510 code on older versions of BYOND.
#if DM_VERSION < 510 #if DM_VERSION < 510
#define BYGEX "code/__HELPERS/bygex.dll" #define BYGEX "code/__HELPERS/bygex"
/proc/replacetext(text, replace, replacement) /proc/replacetext(text, replace, replacement)
if(istype(replace, /regex)) if(istype(replace, /regex))
var/regex/R = replace var/regex/R = replace

1
code/_onclick/_defines.dm Normal file
View File

@@ -0,0 +1 @@
#define CLICKCATCHER_PLANE -99

2
code/_onclick/click.dm
View File

@@ -331,7 +331,7 @@
/obj/screen/click_catcher /obj/screen/click_catcher
icon = 'icons/mob/screen_full.dmi' icon = 'icons/mob/screen_full.dmi'
icon_state = "passage0" icon_state = "passage0"
plane = -99 plane = CLICKCATCHER_PLANE
mouse_opacity = 2 mouse_opacity = 2
screen_loc = "CENTER-7,CENTER-7" screen_loc = "CENTER-7,CENTER-7"

1
code/modules/mob/living/silicon/silicon.dm
View File

@@ -135,7 +135,6 @@
src.take_organ_damage(20) src.take_organ_damage(20)
if(2) if(2)
src.take_organ_damage(10) src.take_organ_damage(10)
Stun(3)
src << "<span class='userdanger'>*BZZZT*</span>" src << "<span class='userdanger'>*BZZZT*</span>"
src << "<span class='danger'>Warning: Electromagnetic pulse detected.</span>" src << "<span class='danger'>Warning: Electromagnetic pulse detected.</span>"
flash_eyes(affect_silicon = 1) flash_eyes(affect_silicon = 1)

1
code/modules/tgui/tgui.dm
View File

@@ -246,7 +246,6 @@
// Generate the JSON. // Generate the JSON.
var/json = json_encode(json_data) var/json = json_encode(json_data)
//var/json = JSON.stringify(json_data)
// Strip #255/improper. // Strip #255/improper.
json = replacetext(json, "\improper", "") json = replacetext(json, "\improper", "")
json = replacetext(json, "\proper", "") json = replacetext(json, "\proper", "")

1
tgstation.dme
View File

@@ -83,6 +83,7 @@
#include "code\_globalvars\lists\mobs.dm" #include "code\_globalvars\lists\mobs.dm"
#include "code\_globalvars\lists\names.dm" #include "code\_globalvars\lists\names.dm"
#include "code\_globalvars\lists\objects.dm" #include "code\_globalvars\lists\objects.dm"
#include "code\_onclick\_defines.dm"
#include "code\_onclick\adjacent.dm" #include "code\_onclick\adjacent.dm"
#include "code\_onclick\ai.dm" #include "code\_onclick\ai.dm"
#include "code\_onclick\click.dm" #include "code\_onclick\click.dm"