"
diff --git a/code/modules/research/departmental_lathe.dm b/code/modules/research/departmental_lathe.dm
index dc3c8ad66ff..ab893e7853b 100644
--- a/code/modules/research/departmental_lathe.dm
+++ b/code/modules/research/departmental_lathe.dm
@@ -187,7 +187,7 @@
/obj/machinery/rnd/protolathe/department/proc/ui_header()
var/list/l = list()
l += "
[host_research.organization] [department_tag] Department Lathe"
- l += "Security protocols: [emagged? "
Disabled" : "
Enabled"]"
+ l += "Security protocols: [(obj_flags & EMAGGED) ? "
Disabled" : "
Enabled"]"
l += "
Material Amount: [materials.total_amount] / [materials.max_amount]"
l += "
Chemical volume: [reagents.total_volume] / [reagents.maximum_volume]"
l += "
Synchronize Research"
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 51797821772..51e2b4bb587 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -191,10 +191,10 @@ doesn't have toxins access.
..()
/obj/machinery/computer/rdconsole/emag_act(mob/user)
- if(!emagged)
+ if(!(obj_flags & EMAGGED))
to_chat(user, "
You disable the security protocols")
playsound(src, "sparks", 75, 1)
- emagged = TRUE
+ obj_flags |= EMAGGED
return ..()
/obj/machinery/computer/rdconsole/proc/list_categories(list/categories, menu_num as num)
@@ -219,7 +219,7 @@ doesn't have toxins access.
var/list/l = list()
l += "
[stored_research.organization] Research and Development Network"
l += "Available points: [round(stored_research.research_points)] (+[round(stored_research.last_bitcoins * 60)] / minute)"
- l += "Security protocols: [emagged? "
Disabled" : "
Enabled"]"
+ l += "Security protocols: [obj_flags & EMAGGED ? "
Disabled" : "
Enabled"]"
l += "
Main Menu |
Back [RDSCREEN_NOBREAK]"
l += "[ui_mode == 1? "
Normal View" : "
Normal View"] | [ui_mode == 2? "
Expert View" : "
Expert View"] | [ui_mode == 3? "
List View" : "
List View"]"
return l
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 8a244bcea10..d712db9a471 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -128,7 +128,7 @@
add_fingerprint(usr)
usr.set_machine(src)
- if(!src.allowed(usr) && !emagged)
+ if(!src.allowed(usr) && !(obj_flags & EMAGGED))
to_chat(usr, "
You do not have the required access level.")
return
@@ -163,9 +163,8 @@
src.updateUsrDialog()
/obj/machinery/computer/rdservercontrol/emag_act(mob/user)
- if(emagged)
+ if(obj_flags & EMAGGED)
return
playsound(src, "sparks", 75, 1)
- emagged = TRUE
+ obj_flags |= EMAGGED
to_chat(user, "
You you disable the security protocols.")
-
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index 3924d29e916..33bfdb8b675 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -12,9 +12,9 @@
/obj/structure/cursed_slot_machine/attack_hand(mob/living/carbon/human/user)
if(!istype(user))
return
- if(in_use)
+ if(obj_flags & IN_USE)
return
- in_use = TRUE
+ obj_flags |= IN_USE
user.adjustCloneLoss(20)
if(user.stat)
to_chat(user, "
No... just one more try...")
@@ -28,7 +28,7 @@
/obj/structure/cursed_slot_machine/proc/determine_victor(mob/living/user)
icon_state = "slots1"
- in_use = FALSE
+ obj_flags &= ~IN_USE
if(prob(win_prob))
playsound(src, 'sound/lavaland/cursed_slot_machine_jackpot.ogg', 50, 0)
new/obj/structure/cursed_money(get_turf(src))
diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm
index 226de327552..4f2d932b1fc 100644
--- a/code/modules/shuttle/computer.dm
+++ b/code/modules/shuttle/computer.dm
@@ -66,9 +66,9 @@
to_chat(usr, "
Unable to comply.")
/obj/machinery/computer/shuttle/emag_act(mob/user)
- if(emagged)
+ if(obj_flags & EMAGGED)
return
req_access = list()
- emagged = TRUE
+ obj_flags |= EMAGGED
to_chat(user, "
You fried the consoles ID checking system.")
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index e11a120ba19..669e7e2185d 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -36,14 +36,14 @@
var/name = ID.registered_name
var/job = ID.assignment
- if(emagged)
+ if(obj_flags & EMAGGED)
name = Gibberish(name, 0)
job = Gibberish(job, 0)
A += list(list("name" = name, "job" = job))
data["authorizations"] = A
data["enabled"] = (IS_DOCKED && !ENGINES_STARTED)
- data["emagged"] = emagged
+ data["emagged"] = obj_flags & EMAGGED ? 1 : 0
return data
/obj/machinery/computer/emergency_shuttle/ui_act(action, params, datum/tgui/ui)
@@ -119,16 +119,16 @@
if(SSshuttle.emergency.mode == SHUTTLE_STRANDED)
authorized.Cut()
- emagged = FALSE
+ obj_flags &= ~EMAGGED
if(ENGINES_STARTED || (!IS_DOCKED))
return .
// Check to see if we've reached criteria for early launch
- if((authorized.len >= auth_need) || emagged)
+ if((authorized.len >= auth_need) || (obj_flags & EMAGGED))
// shuttle timers use 1/10th seconds internally
SSshuttle.emergency.setTimer(ENGINES_START_TIME)
- var/system_error = emagged ? "SYSTEM ERROR:" : null
+ var/system_error = obj_flags & EMAGGED ? "SYSTEM ERROR:" : null
minor_announce("The emergency shuttle will launch in \
[TIME_LEFT] seconds", system_error, alert=TRUE)
. = TRUE
@@ -138,7 +138,7 @@
if(!IS_DOCKED)
return
- if(emagged || ENGINES_STARTED) //SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LAUNCH IN 10 SECONDS
+ if((obj_flags & EMAGGED) || ENGINES_STARTED) //SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LAUNCH IN 10 SECONDS
to_chat(user, "
The shuttle is already about to launch!")
return
@@ -149,7 +149,7 @@
has emagged the emergency shuttle [time] seconds before launch.", 0, 1)
log_game("[key_name(user)] has emagged the emergency shuttle in \
[COORD(src)] [time] seconds before launch.")
- emagged = TRUE
+ obj_flags |= EMAGGED
var/datum/species/S = new
for(var/i in 1 to 10)
// the shuttle system doesn't know who these people are, but they
@@ -415,7 +415,7 @@
/obj/docking_port/mobile/pod/request()
var/obj/machinery/computer/shuttle/S = getControlConsole()
- if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA || (S && S.emagged))
+ if(GLOB.security_level == SEC_LEVEL_RED || GLOB.security_level == SEC_LEVEL_DELTA || (S && (S.obj_flags & EMAGGED)))
if(launch_status == UNLAUNCHED)
launch_status = EARLY_LAUNCHED
return ..()
@@ -446,9 +446,9 @@
return
/obj/machinery/computer/shuttle/pod/emag_act(mob/user)
- if(emagged)
+ if(obj_flags & EMAGGED)
return
- emagged = TRUE
+ obj_flags |= EMAGGED
to_chat(user, "
You fry the pod's alert level checking system.")
/obj/docking_port/stationary/random
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 13216826a4f..c9acfebb9c3 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -122,7 +122,7 @@
/obj/machinery/satellite/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/device/multitool))
- to_chat(user, "
// NTSAT-[id] // Mode : [active ? "PRIMARY" : "STANDBY"] //[emagged ? "DEBUG_MODE //" : ""]")
+ to_chat(user, "
// NTSAT-[id] // Mode : [active ? "PRIMARY" : "STANDBY"] //[(obj_flags & EMAGGED) ? "DEBUG_MODE //" : ""]")
else
return ..()
@@ -147,14 +147,14 @@
continue
if(get_dist(M,src) > kill_range)
continue
- if(!emagged && space_los(M))
+ if(!(obj_flags & EMAGGED) && space_los(M))
Beam(get_turf(M),icon_state="sat_beam",time=5,maxdistance=kill_range)
qdel(M)
/obj/machinery/satellite/meteor_shield/toggle(user)
if(!..(user))
return FALSE
- if(emagged)
+ if(obj_flags & EMAGGED)
if(active)
change_meteor_chance(2)
else
@@ -167,12 +167,12 @@
/obj/machinery/satellite/meteor_shield/Destroy()
. = ..()
- if(active && emagged)
+ if(active && (obj_flags & EMAGGED))
change_meteor_chance(0.5)
/obj/machinery/satellite/meteor_shield/emag_act()
- if(emagged)
+ if(obj_flags & EMAGGED)
return
- emagged = TRUE
+ obj_flags |= EMAGGED
if(active)
change_meteor_chance(2)
diff --git a/html/browser/common.css b/html/browser/common.css
index 4b2d05a3dd4..c58877bb69d 100644
--- a/html/browser/common.css
+++ b/html/browser/common.css
@@ -1,5 +1,5 @@
-body
-{
+body
+{
padding: 0;
margin: 0;
background-color: #272727;
@@ -14,9 +14,9 @@ hr
height: 1px;
}
-a, a:link, a:visited, a:active, .linkOn, .linkOff
-{
- color: #ffffff;
+a, button, a:link, a:visited, a:active, .linkOn, .linkOff
+{
+ color: #ffffff;
text-decoration: none;
background: #40628a;
border: 1px solid #161616;
@@ -25,15 +25,15 @@ a, a:link, a:visited, a:active, .linkOn, .linkOff
cursor:default;
}
-a:hover
-{
+a:hover
+{
color: #40628a;
background: #ffffff;
}
a.white, a.white:link, a.white:visited, a.white:active
-{
- color: #40628a;
+{
+ color: #40628a;
text-decoration: none;
background: #ffffff;
border: 1px solid #161616;
@@ -42,22 +42,22 @@ a.white, a.white:link, a.white:visited, a.white:active
cursor:default;
}
-a.white:hover
-{
+a.white:hover
+{
color: #ffffff;
background: #40628a;
}
.linkOn, a.linkOn:link, a.linkOn:visited, a.linkOn:active, a.linkOn:hover
-{
- color: #ffffff;
+{
+ color: #ffffff;
background: #2f943c;
border-color: #24722e;
}
.linkOff, a.linkOff:link, a.linkOff:visited, a.linkOff:active, a.linkOff:hover
-{
- color: #ffffff;
+{
+ color: #ffffff;
background: #999999;
border-color: #666666;
}
@@ -89,15 +89,15 @@ li
padding: 0 0 2px 0;
}
-img, a img
-{
- border-style:none;
+img, a img
+{
+ border-style:none;
}
h1, h2, h3, h4, h5, h6
{
margin: 0;
- padding: 16px 0 8px 0;
+ padding: 16px 0 8px 0;
color: #517087;
}
@@ -146,7 +146,7 @@ h4
}
.uiContent
-{
+{
clear: both;
padding: 8px;
font-family: Verdana, Geneva, sans-serif;
@@ -189,7 +189,7 @@ h4
}
.notice.icon
-{
+{
padding: 2px 4px 0 20px;
}
@@ -303,4 +303,71 @@ div.notice
{
width: 100%;
clear: both;
-}
\ No newline at end of file
+}
+
+
+.switch {
+ position: relative;
+ display: inline-block;
+ width: 50px;
+ height: 26px;
+}
+
+.switch input {display:none;}
+
+.slider {
+ position: absolute;
+ cursor: pointer;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: #383838;
+ transition: .4s;
+}
+
+.slider:before {
+ position: absolute;
+ content: "";
+ height: 18px;
+ width: 18px;
+ left: 4px;
+ bottom: 4px;
+ background-color: #98B0C3;
+ transition: .4s;
+}
+
+input:checked + .slider {
+ background-color: #40628a;
+}
+
+input:focus + .slider {
+ box-shadow: 0 0 1px #2196F3;
+}
+
+input:checked + .slider:before {
+ transform: translateX(24px);
+}
+
+.switch span {
+ display: inline-block;
+ position: relative;
+ width: 60px;
+ margin-left: 60px;
+}
+
+ul.sparse {
+ padding-bottom:20px;
+}
+
+.sparse li {
+ margin-top: 2px;
+}
+
+.slider.round {
+ border-radius: 34px;
+}
+
+.slider.round:before {
+ border-radius: 50%;
+}
diff --git a/tgstation.dme b/tgstation.dme
index e5b88557de1..7463504c81d 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -57,6 +57,7 @@
#include "code\__DEFINES\mobs.dm"
#include "code\__DEFINES\monkeys.dm"
#include "code\__DEFINES\networks.dm"
+#include "code\__DEFINES\obj_flags.dm"
#include "code\__DEFINES\pinpointers.dm"
#include "code\__DEFINES\pipe_construction.dm"
#include "code\__DEFINES\preferences.dm"