From 3cac44b2f016c8b083ef0543e198d568587398e9 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 15 Feb 2021 19:35:16 -0700
Subject: [PATCH] a
---
code/__DEFINES/robots.dm | 10 +++++-----
code/modules/atmospherics/machinery/airalarm.dm | 8 ++++----
code/modules/mob/living/silicon/pai/pai.dm | 2 +-
code/modules/mob/living/silicon/silicon.dm | 2 +-
code/modules/mob/living/simple_animal/bot/bot.dm | 2 +-
.../mob/living/simple_animal/friendly/drone/_drone.dm | 2 +-
code/modules/mob/mob_helpers.dm | 6 +++---
code/modules/power/apc.dm | 8 ++++----
html/changelogs/.all_changelog.yml | 2 +-
9 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm
index a0fded3798..dda9cfd430 100644
--- a/code/__DEFINES/robots.dm
+++ b/code/__DEFINES/robots.dm
@@ -69,8 +69,8 @@
//Checks to determine borg availability depending on the server's config. These are defines in the interest of reducing copypasta
#define BORG_SEC_AVAILABLE (!CONFIG_GET(flag/disable_secborg) && GLOB.security_level >= CONFIG_GET(number/minimum_secborg_alert))
-//silicon_priviledges flags
-#define PRIVILEDGES_SILICON (1<<0)
-#define PRIVILEDGES_PAI (1<<1)
-#define PRIVILEDGES_BOT (1<<2)
-#define PRIVILEDGES_DRONE (1<<3)
+//silicon_privileges flags
+#define PRIVILEGES_SILICON (1<<0)
+#define PRIVILEGES_PAI (1<<1)
+#define PRIVILEGES_BOT (1<<2)
+#define PRIVILEGES_DRONE (1<<3)
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 6049ee965e..ccb8a3d81c 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -304,7 +304,7 @@
"danger_level" = cur_tlv.get_danger_level(environment.get_moles(gas_id) * partial_pressure)
))
- if(!locked || hasSiliconAccessInArea(user, PRIVILEDGES_SILICON|PRIVILEDGES_DRONE))
+ if(!locked || hasSiliconAccessInArea(user, PRIVILEGES_SILICON|PRIVILEGES_DRONE))
data["vents"] = list()
for(var/id_tag in A.air_vent_names)
var/long_name = A.air_vent_names[id_tag]
@@ -385,13 +385,13 @@
if(..() || buildstage != 2)
return
var/silicon_access = hasSiliconAccessInArea(usr)
- var/bot_priviledges = silicon_access || (usr.silicon_privileges & PRIVILEDGES_DRONE)
- if((locked && !bot_priviledges) || (silicon_access && aidisabled))
+ var/bot_privileges = silicon_access || (usr.silicon_privileges & PRIVILEGES_DRONE)
+ if((locked && !bot_privileges) || (silicon_access && aidisabled))
return
var/device_id = params["id_tag"]
switch(action)
if("lock")
- if(bot_priviledges && !wires.is_cut(WIRE_IDSCAN))
+ if(bot_privileges && !wires.is_cut(WIRE_IDSCAN))
locked = !locked
. = TRUE
if("power", "toggle_filter", "widenet", "scrubbing")
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 5740f98e90..4e33fba208 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -11,7 +11,7 @@
maxHealth = 500
layer = BELOW_MOB_LAYER
var/obj/item/instrument/piano_synth/internal_instrument
- silicon_privileges = PRIVILEDGES_PAI
+ silicon_privileges = PRIVILEGES_PAI
var/network = "ss13"
var/obj/machinery/camera/current = null
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 944b909463..b2b27c7d70 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -1,6 +1,6 @@
/mob/living/silicon
gender = NEUTER
- silicon_privileges = PRIVILEDGES_SILICON
+ silicon_privileges = PRIVILEGES_SILICON
verb_say = "states"
verb_ask = "queries"
verb_exclaim = "declares"
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index bb7c437ca7..d3838a580f 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -15,7 +15,7 @@
maxbodytemp = INFINITY
minbodytemp = 0
blood_volume = 0
- silicon_privileges = PRIVILEDGES_BOT
+ silicon_privileges = PRIVILEGES_BOT
sentience_type = SENTIENCE_ARTIFICIAL
status_flags = NONE //no default canpush
verb_say = "states"
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index e11facb4ba..ecd5db3ccf 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -40,7 +40,7 @@
bubble_icon = "machine"
initial_language_holder = /datum/language_holder/drone
mob_size = MOB_SIZE_SMALL
- silicon_privileges = PRIVILEDGES_DRONE
+ silicon_privileges = PRIVILEGES_DRONE
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD)
unique_name = TRUE
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 605f0a2d55..4b0f505067 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -408,7 +408,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return
return TRUE
-/atom/proc/hasSiliconAccessInArea(mob/user, flags = PRIVILEDGES_SILICON)
+/atom/proc/hasSiliconAccessInArea(mob/user, flags = PRIVILEGES_SILICON)
return user.silicon_privileges & (flags) || (user.siliconaccesstoggle && (get_area(src) in user.siliconaccessareas))
/mob/proc/toggleSiliconAccessArea(area/area)
@@ -496,7 +496,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
colored_message = "[message]"
else
colored_message = "[message]"
-
+
//This makes readability a bit better for admins.
switch(message_type)
if(LOG_WHISPER)
@@ -507,7 +507,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
colored_message = "(ASAY) [colored_message]"
if(LOG_EMOTE)
colored_message = "(EMOTE) [colored_message]"
-
+
var/list/timestamped_message = list("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(src)] [loc_name(src)] (Event #[LAZYLEN(logging[smessage_type])])" = colored_message)
logging[smessage_type] += timestamped_message
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 762e9fe39c..ccb841dec8 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -903,7 +903,7 @@
if(H && !H.stealthmode && H.toggled)
abilitiesavail = TRUE
var/list/data = list(
- "locked" = locked && !(integration_cog && is_servant_of_ratvar(user)) && !area.hasSiliconAccessInArea(user, PRIVILEDGES_SILICON|PRIVILEDGES_DRONE),
+ "locked" = locked && !(integration_cog && is_servant_of_ratvar(user)) && !area.hasSiliconAccessInArea(user, PRIVILEGES_SILICON|PRIVILEGES_DRONE),
"failTime" = failure_timer,
"isOperating" = operating,
"externalPower" = main_status,
@@ -994,7 +994,7 @@
return TRUE
if (user == hijacker || (area.hasSiliconAccessInArea(user) && !aidisabled))
return TRUE
- if(user.silicon_privileges & PRIVILEDGES_SILICON)
+ if(user.silicon_privileges & PRIVILEGES_SILICON)
var/mob/living/silicon/ai/AI = user
var/mob/living/silicon/robot/robot = user
if (src.aidisabled || malfhack && istype(malfai) && ((istype(AI) && (malfai!=AI && malfai != AI.parent)) || (istype(robot) && (robot in malfai.connected_robots))))
@@ -1023,7 +1023,7 @@
if(action == "hijack" && can_use(usr, 1)) //don't need auth for hijack button
hijack(usr)
return
- if(locked && !area.hasSiliconAccessInArea(usr, PRIVILEDGES_SILICON|PRIVILEDGES_DRONE) && !failure_timer && action != "toggle_nightshift" && (!integration_cog || !(is_servant_of_ratvar(usr))))
+ if(locked && !area.hasSiliconAccessInArea(usr, PRIVILEGES_SILICON|PRIVILEGES_DRONE) && !failure_timer && action != "toggle_nightshift" && (!integration_cog || !(is_servant_of_ratvar(usr))))
return
switch(action)
if("lock")
@@ -1064,7 +1064,7 @@
update()
. = TRUE
if("overload")
- if(area.hasSiliconAccessInArea(usr, PRIVILEDGES_SILICON|PRIVILEDGES_DRONE)) //usr.has_unlimited_silicon_privilege)
+ if(area.hasSiliconAccessInArea(usr, PRIVILEGES_SILICON|PRIVILEGES_DRONE)) //usr.has_unlimited_silicon_privilege)
overload_lighting()
. = TRUE
if("hack")
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 73e9e9eb37..40b71985e9 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26243,7 +26243,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Ghommie:
- bugfix: You can now actually gain wiring experience from using cable coils.
- bugfix: Opening the View Skill Panel shouldn't trigger messages about insufficient
- admin priviledges anymore.
+ admin privileges anymore.
Yakumo Chen, kappa-sama:
- rscdel: Removes improvised handguns
- rscdel: removed handsaws, improvised gun barrels (you can use atmos pipes again)