mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Merge pull request #14618 from variableundefined/appropriate
Rename all instances of "virgin" being used as a variable name
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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]<BR>"
|
||||
P.info += "</TT>"
|
||||
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]<BR>"
|
||||
P.info += "</TT>"
|
||||
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, "<span class='warning'>[src] is jammed, give it a few seconds.</span>")
|
||||
else
|
||||
if(virgin)
|
||||
if(!populated)
|
||||
fillCurrent()
|
||||
virgin = FALSE
|
||||
populated = TRUE
|
||||
if(user.mind.special_role != "devil")
|
||||
return ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user