mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-11 10:22:13 +00:00
Merge pull request #14252 from silicons/pet_peeve
spellchecks priviledge --> privilege
This commit is contained in:
@@ -69,8 +69,8 @@
|
|||||||
//Checks to determine borg availability depending on the server's config. These are defines in the interest of reducing copypasta
|
//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))
|
#define BORG_SEC_AVAILABLE (!CONFIG_GET(flag/disable_secborg) && GLOB.security_level >= CONFIG_GET(number/minimum_secborg_alert))
|
||||||
|
|
||||||
//silicon_priviledges flags
|
//silicon_privileges flags
|
||||||
#define PRIVILEDGES_SILICON (1<<0)
|
#define PRIVILEGES_SILICON (1<<0)
|
||||||
#define PRIVILEDGES_PAI (1<<1)
|
#define PRIVILEGES_PAI (1<<1)
|
||||||
#define PRIVILEDGES_BOT (1<<2)
|
#define PRIVILEGES_BOT (1<<2)
|
||||||
#define PRIVILEDGES_DRONE (1<<3)
|
#define PRIVILEGES_DRONE (1<<3)
|
||||||
|
|||||||
@@ -304,7 +304,7 @@
|
|||||||
"danger_level" = cur_tlv.get_danger_level(environment.get_moles(gas_id) * partial_pressure)
|
"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()
|
data["vents"] = list()
|
||||||
for(var/id_tag in A.air_vent_names)
|
for(var/id_tag in A.air_vent_names)
|
||||||
var/long_name = A.air_vent_names[id_tag]
|
var/long_name = A.air_vent_names[id_tag]
|
||||||
@@ -385,13 +385,13 @@
|
|||||||
if(..() || buildstage != 2)
|
if(..() || buildstage != 2)
|
||||||
return
|
return
|
||||||
var/silicon_access = hasSiliconAccessInArea(usr)
|
var/silicon_access = hasSiliconAccessInArea(usr)
|
||||||
var/bot_priviledges = silicon_access || (usr.silicon_privileges & PRIVILEDGES_DRONE)
|
var/bot_privileges = silicon_access || (usr.silicon_privileges & PRIVILEGES_DRONE)
|
||||||
if((locked && !bot_priviledges) || (silicon_access && aidisabled))
|
if((locked && !bot_privileges) || (silicon_access && aidisabled))
|
||||||
return
|
return
|
||||||
var/device_id = params["id_tag"]
|
var/device_id = params["id_tag"]
|
||||||
switch(action)
|
switch(action)
|
||||||
if("lock")
|
if("lock")
|
||||||
if(bot_priviledges && !wires.is_cut(WIRE_IDSCAN))
|
if(bot_privileges && !wires.is_cut(WIRE_IDSCAN))
|
||||||
locked = !locked
|
locked = !locked
|
||||||
. = TRUE
|
. = TRUE
|
||||||
if("power", "toggle_filter", "widenet", "scrubbing")
|
if("power", "toggle_filter", "widenet", "scrubbing")
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
maxHealth = 500
|
maxHealth = 500
|
||||||
layer = BELOW_MOB_LAYER
|
layer = BELOW_MOB_LAYER
|
||||||
var/obj/item/instrument/piano_synth/internal_instrument
|
var/obj/item/instrument/piano_synth/internal_instrument
|
||||||
silicon_privileges = PRIVILEDGES_PAI
|
silicon_privileges = PRIVILEGES_PAI
|
||||||
|
|
||||||
var/network = "ss13"
|
var/network = "ss13"
|
||||||
var/obj/machinery/camera/current = null
|
var/obj/machinery/camera/current = null
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/mob/living/silicon
|
/mob/living/silicon
|
||||||
gender = NEUTER
|
gender = NEUTER
|
||||||
silicon_privileges = PRIVILEDGES_SILICON
|
silicon_privileges = PRIVILEGES_SILICON
|
||||||
verb_say = "states"
|
verb_say = "states"
|
||||||
verb_ask = "queries"
|
verb_ask = "queries"
|
||||||
verb_exclaim = "declares"
|
verb_exclaim = "declares"
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
maxbodytemp = INFINITY
|
maxbodytemp = INFINITY
|
||||||
minbodytemp = 0
|
minbodytemp = 0
|
||||||
blood_volume = 0
|
blood_volume = 0
|
||||||
silicon_privileges = PRIVILEDGES_BOT
|
silicon_privileges = PRIVILEGES_BOT
|
||||||
sentience_type = SENTIENCE_ARTIFICIAL
|
sentience_type = SENTIENCE_ARTIFICIAL
|
||||||
status_flags = NONE //no default canpush
|
status_flags = NONE //no default canpush
|
||||||
verb_say = "states"
|
verb_say = "states"
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
bubble_icon = "machine"
|
bubble_icon = "machine"
|
||||||
initial_language_holder = /datum/language_holder/drone
|
initial_language_holder = /datum/language_holder/drone
|
||||||
mob_size = MOB_SIZE_SMALL
|
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)
|
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)
|
hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD)
|
||||||
unique_name = TRUE
|
unique_name = TRUE
|
||||||
|
|||||||
@@ -408,7 +408,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
|
|||||||
return
|
return
|
||||||
return TRUE
|
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))
|
return user.silicon_privileges & (flags) || (user.siliconaccesstoggle && (get_area(src) in user.siliconaccessareas))
|
||||||
|
|
||||||
/mob/proc/toggleSiliconAccessArea(area/area)
|
/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 = "<font color=[color]>[message]</font>"
|
colored_message = "<font color=[color]>[message]</font>"
|
||||||
else
|
else
|
||||||
colored_message = "<font color='[color]'>[message]</font>"
|
colored_message = "<font color='[color]'>[message]</font>"
|
||||||
|
|
||||||
//This makes readability a bit better for admins.
|
//This makes readability a bit better for admins.
|
||||||
switch(message_type)
|
switch(message_type)
|
||||||
if(LOG_WHISPER)
|
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]"
|
colored_message = "(ASAY) [colored_message]"
|
||||||
if(LOG_EMOTE)
|
if(LOG_EMOTE)
|
||||||
colored_message = "(EMOTE) [colored_message]"
|
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)
|
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
|
logging[smessage_type] += timestamped_message
|
||||||
|
|||||||
@@ -903,7 +903,7 @@
|
|||||||
if(H && !H.stealthmode && H.toggled)
|
if(H && !H.stealthmode && H.toggled)
|
||||||
abilitiesavail = TRUE
|
abilitiesavail = TRUE
|
||||||
var/list/data = list(
|
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,
|
"failTime" = failure_timer,
|
||||||
"isOperating" = operating,
|
"isOperating" = operating,
|
||||||
"externalPower" = main_status,
|
"externalPower" = main_status,
|
||||||
@@ -994,7 +994,7 @@
|
|||||||
return TRUE
|
return TRUE
|
||||||
if (user == hijacker || (area.hasSiliconAccessInArea(user) && !aidisabled))
|
if (user == hijacker || (area.hasSiliconAccessInArea(user) && !aidisabled))
|
||||||
return TRUE
|
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/ai/AI = user
|
||||||
var/mob/living/silicon/robot/robot = 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))))
|
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
|
if(action == "hijack" && can_use(usr, 1)) //don't need auth for hijack button
|
||||||
hijack(usr)
|
hijack(usr)
|
||||||
return
|
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
|
return
|
||||||
switch(action)
|
switch(action)
|
||||||
if("lock")
|
if("lock")
|
||||||
@@ -1064,7 +1064,7 @@
|
|||||||
update()
|
update()
|
||||||
. = TRUE
|
. = TRUE
|
||||||
if("overload")
|
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()
|
overload_lighting()
|
||||||
. = TRUE
|
. = TRUE
|
||||||
if("hack")
|
if("hack")
|
||||||
|
|||||||
@@ -26243,7 +26243,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
|
|||||||
Ghommie:
|
Ghommie:
|
||||||
- bugfix: You can now actually gain wiring experience from using cable coils.
|
- bugfix: You can now actually gain wiring experience from using cable coils.
|
||||||
- bugfix: Opening the View Skill Panel shouldn't trigger messages about insufficient
|
- bugfix: Opening the View Skill Panel shouldn't trigger messages about insufficient
|
||||||
admin priviledges anymore.
|
admin privileges anymore.
|
||||||
Yakumo Chen, kappa-sama:
|
Yakumo Chen, kappa-sama:
|
||||||
- rscdel: Removes improvised handguns
|
- rscdel: Removes improvised handguns
|
||||||
- rscdel: removed handsaws, improvised gun barrels (you can use atmos pipes again)
|
- rscdel: removed handsaws, improvised gun barrels (you can use atmos pipes again)
|
||||||
|
|||||||
Reference in New Issue
Block a user