diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm
index 47731fd48d3..8fa6e0d7dd1 100644
--- a/code/game/objects/structures/spirit_board.dm
+++ b/code/game/objects/structures/spirit_board.dm
@@ -5,7 +5,7 @@
icon_state = "spirit_board"
density = 1
anchored = 0
- var/virgin = 1
+ var/used = FALSE
var/cooldown = 0
var/planchette = "A"
var/lastuser = null
@@ -28,8 +28,8 @@
if(!spirit_board_checks(M))
return 0
- if(virgin)
- virgin = 0
+ if(!used)
+ used = TRUE
notify_ghosts("Someone has begun playing with a [src.name] in [get_area(src)]!", source = src)
planchette = input("Choose the letter.", "Seance!") in list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z")
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 957b0828725..3a2b646e510 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -9,7 +9,7 @@
/mob/living/carbon/human/proc/forcesay(list/append)
if(stat == CONSCIOUS)
if(client)
- var/virgin = 1 //has the text been modified yet?
+ var/modified = FALSE //has the text been modified yet?
var/temp = winget(client, "input", "text")
if(findtextEx(temp, "Say \"", 1, 7) && length(temp) > 5) //case sensitive means
@@ -17,11 +17,11 @@
if(findtext(trim_left(temp), ":", 6, 7)) //dept radio
temp = copytext(trim_left(temp), 8)
- virgin = 0
+ modified = TRUE
- if(virgin)
+ if(!modified)
temp = copytext(trim_left(temp), 6) //normal speech
- virgin = 0
+ modified = TRUE
while(findtext(trim_left(temp), ":", 1, 2)) //dept radio again (necessary)
temp = copytext(trim_left(temp), 3)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 617629e1b9a..a767383b72b 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -432,7 +432,7 @@
spawn(30)
for(var/C in GLOB.employmentCabinets)
var/obj/structure/filingcabinet/employment/employmentCabinet = C
- if(!employmentCabinet.virgin)
+ if(employmentCabinet.populated)
employmentCabinet.addFile(employee)
/mob/new_player/proc/AnnounceCyborg(var/mob/living/character, var/rank, var/join_message)
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index 01552b6b3e2..b5ea1bf1396 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -113,11 +113,11 @@
* Security Record Cabinets
*/
/obj/structure/filingcabinet/security
- var/virgin = TRUE
+ var/populated = FALSE
/obj/structure/filingcabinet/security/proc/populate()
- if(virgin)
+ if(!populated)
for(var/datum/data/record/G in GLOB.data_core.general)
var/datum/data/record/S
for(var/datum/data/record/R in GLOB.data_core.security)
@@ -132,7 +132,7 @@
P.info += "[c]
"
P.info += ""
P.name = "paper - '[G.fields["name"]]'"
- virgin = FALSE //tabbing here is correct- it's possible for people to try and use it
+ populated = TRUE //tabbing here is correct- it's possible for people to try and use it
//before the records have been generated, so we do this inside the loop.
/obj/structure/filingcabinet/security/attack_hand()
@@ -147,10 +147,10 @@
* Medical Record Cabinets
*/
/obj/structure/filingcabinet/medical
- var/virgin = TRUE
+ var/populated = FALSE
/obj/structure/filingcabinet/medical/proc/populate()
- if(virgin)
+ if(!populated)
for(var/datum/data/record/G in GLOB.data_core.general)
var/datum/data/record/M
for(var/datum/data/record/R in GLOB.data_core.medical)
@@ -165,7 +165,7 @@
P.info += "[c]
"
P.info += ""
P.name = "paper - '[G.fields["name"]]'"
- virgin = FALSE //tabbing here is correct- it's possible for people to try and use it
+ populated = TRUE //tabbing here is correct- it's possible for people to try and use it
//before the records have been generated, so we do this inside the loop.
/obj/structure/filingcabinet/medical/attack_hand()
@@ -185,7 +185,7 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
/obj/structure/filingcabinet/employment
var/cooldown = FALSE // Only used for devils
icon_state = "employmentcabinet"
- var/virgin = TRUE
+ var/populated = FALSE
/obj/structure/filingcabinet/employment/New()
GLOB.employmentCabinets += src
@@ -212,9 +212,9 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
if(cooldown)
to_chat(user, "[src] is jammed, give it a few seconds.")
else
- if(virgin)
+ if(!populated)
fillCurrent()
- virgin = FALSE
+ populated = TRUE
if(user.mind.special_role != "devil")
return ..()