From c72561d1941ed20b2eecbabe526eaa8de786eac1 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Sat, 29 Sep 2018 17:28:50 +0100 Subject: [PATCH] addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines --- code/game/objects/items/devices/scanners.dm | 6 ++--- code/modules/admin/topic.dm | 2 +- code/modules/nano/modules/ert_manager.dm | 2 +- code/modules/projectiles/guns/energy/laser.dm | 2 +- code/modules/response_team/ert.dm | 21 +++++++++--------- code/modules/response_team/ert_outfits.dm | 22 ++++++++----------- .../security_levels/keycard authentication.dm | 2 +- 7 files changed, 26 insertions(+), 31 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 5ed7d1710a5..5955c430734 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -685,14 +685,14 @@ REAGENT SCANNER return if(!ready) - to_chat(user, "The scanner beeps angrily at you! It's currently recharging - [round((time_to_use - world.time) * 0.1)] seconds remaining.") + to_chat(user, "The scanner beeps angrily at you! It's currently recharging - [round((time_to_use - world.time) * 0.1)] seconds remaining.") playsound(user.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) return if(power_supply.charge >= usecharge) mobScan(M, user) else - to_chat(user, "The scanner beeps angrily at you! It's out of charge!") + to_chat(user, "The scanner beeps angrily at you! It's out of charge!") playsound(user.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) /obj/item/bodyanalyzer/proc/mobScan(mob/living/M, mob/user) @@ -740,7 +740,7 @@ REAGENT SCANNER var/found_disease = FALSE for(var/thing in target.viruses) var/datum/disease/D = thing - if(D.visibility_flags & HIDDEN_SCANNER || D.visibility_flags & HIDDEN_PANDEMIC) + if(D.visibility_flags) //If any visibility flags are on. continue found_disease = TRUE break diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 194b1d49035..6f2520c8783 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2066,7 +2066,7 @@ var/input = input(src.owner, "Please enter a reason for denying [key_name(H)]'s ERT request.","Outgoing message from CentComm", "") if(!input) return - ert_request_answered = 1 + ert_request_answered = TRUE to_chat(src.owner, "You sent [input] to [H] via a secure channel.") log_admin("[src.owner] denied [key_name(H)]'s ERT request with the message [input].") to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Your ERT request has been denied for the following reasons: [input]. Message ends.\"") diff --git a/code/modules/nano/modules/ert_manager.dm b/code/modules/nano/modules/ert_manager.dm index d954c36ee2d..1d70157f079 100644 --- a/code/modules/nano/modules/ert_manager.dm +++ b/code/modules/nano/modules/ert_manager.dm @@ -50,7 +50,7 @@ cyborg_slots = text2num(href_list["set_cyb"]) if(href_list["dispatch_ert"]) - ert_request_answered = 1 + ert_request_answered = TRUE var/slots_list = list() if(commander_slots > 0) slots_list += "commander: [commander_slots]" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index f4cd13419b4..75da1fdbedd 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -127,7 +127,7 @@ /obj/item/gun/energy/immolator/multi name = "multi lens immolator cannon" - desc = "A large laser cannon, similar to the Immolator Laser, with togglable firemodes. It is frequently used by military-like forces through Nanotrasen." + desc = "A large laser cannon, similar to the Immolator Laser, with toggleable firemodes. It is frequently used by military-like forces through Nanotrasen." icon_state = "multilensimmolator" ammo_type = list(/obj/item/ammo_casing/energy/immolator/strong, /obj/item/ammo_casing/energy/immolator/scatter) origin_tech = "combat=5;magnets=5;powerstorage=4" diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index d38acae9c3a..8614df8135b 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -10,8 +10,8 @@ var/list/response_team_members = list() var/responseteam_age = 21 // Minimum account age to play as an ERT member var/datum/response_team/active_team = null -var/send_emergency_team = 0 -var/ert_request_answered = 0 +var/send_emergency_team = FALSE +var/ert_request_answered = FALSE /client/proc/response_team() set name = "Dispatch CentComm Response Team" @@ -25,7 +25,7 @@ var/ert_request_answered = 0 to_chat(usr, "The game hasn't started yet!") return - if(ticker.current_state == 1) + if(ticker.current_state == GAME_STATE_PREGAME) to_chat(usr, "The round hasn't started yet!") return @@ -39,11 +39,11 @@ var/ert_request_answered = 0 /mob/dead/observer/proc/JoinResponseTeam() if(!send_emergency_team) - to_chat(src, "No emergency response team is currently being sent.") + to_chat(src, "No emergency response team is currently being sent.") return 0 if(jobban_isbanned(src, ROLE_ERT)) - to_chat(src, "You are jobbanned from the emergency reponse team!") + to_chat(src, "You are jobbanned from playing on an emergency response team!") return 0 var/player_age_check = check_client_age(client, responseteam_age) @@ -56,7 +56,7 @@ var/ert_request_answered = 0 return 0 if(response_team_members.len > 6) - to_chat(src, "The emergency response team is already full!") + to_chat(src, "The emergency response team is already full!") return 0 return 1 @@ -66,11 +66,11 @@ var/ert_request_answered = 0 active_team = response_team_type active_team.setSlots(commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots) - send_emergency_team = 1 + send_emergency_team = TRUE var/list/ert_candidates = pollCandidates("Join the Emergency Response Team?",, responseteam_age, 600, 1, role_playtime_requirements[ROLE_ERT]) if(!ert_candidates.len) active_team.cannot_send_team() - send_emergency_team = 0 + send_emergency_team = FALSE return 0 // Respawnable players get first dibs @@ -86,7 +86,7 @@ var/ert_request_answered = 0 if(!response_team_members.len) active_team.cannot_send_team() - send_emergency_team = 0 + send_emergency_team = FALSE return 0 var/index = 1 @@ -115,7 +115,7 @@ var/ert_request_answered = 0 new_commando.update_icons() index++ - send_emergency_team = 0 + send_emergency_team = FALSE active_team.announce_team() return 1 @@ -366,4 +366,3 @@ var/ert_request_answered = 0 new /obj/item/radio/centcom(src) new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) - return diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 2d0758440f8..74bb7ae81de 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -90,7 +90,7 @@ /obj/item/restraints/handcuffs = 1, /obj/item/storage/lockbox/mindshield = 1, /obj/item/gun/energy/ionrifle/carbine = 1, - /obj/item/ammo_box/magazine/m45/enforcer45/lethal = 2, + /obj/item/ammo_box/magazine/m45/enforcer45/lethal = 2 ) cybernetic_implants = list( @@ -179,7 +179,7 @@ /obj/item/storage/box/handcuffs = 1, /obj/item/storage/box/flashbangs = 1, /obj/item/whetstone = 1, - /obj/item/storage/lockbox/t4 = 1, + /obj/item/storage/lockbox/t4 = 1 ) cybernetic_implants = list( @@ -187,7 +187,7 @@ /obj/item/organ/internal/cyberimp/eyes/hud/security, /obj/item/organ/internal/cyberimp/brain/anti_stun, /obj/item/organ/internal/cyberimp/arm/telebaton, - /obj/item/organ/internal/cyberimp/chest/reviver, + /obj/item/organ/internal/cyberimp/chest/reviver ) @@ -261,7 +261,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma = 1, /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/rcd/combat = 1, - /obj/item/rcd_ammo/large = 3, + /obj/item/rcd_ammo/large = 3 ) cybernetic_implants = list( @@ -269,7 +269,7 @@ /obj/item/organ/internal/cyberimp/eyes/hud/security, /obj/item/organ/internal/cyberimp/brain/anti_stun, /obj/item/organ/internal/cyberimp/eyes/shield, - /obj/item/organ/internal/cyberimp/arm/toolset, + /obj/item/organ/internal/cyberimp/arm/toolset ) //////////////////// MEDIC /////////////////// @@ -343,9 +343,6 @@ suit = /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma glasses = /obj/item/clothing/glasses/night suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 - cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/surgery - ) belt = /obj/item/defibrillator/compact/loaded @@ -358,7 +355,7 @@ /obj/item/bodyanalyzer/advanced = 1, /obj/item/extinguisher/mini = 1, /obj/item/storage/belt/medical/surgery/loaded = 1, - /obj/item/roller = 1, + /obj/item/roller = 1 ) cybernetic_implants = list( @@ -459,14 +456,13 @@ suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor head = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor glasses = /obj/item/clothing/glasses/hud/security/sunglasses - cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/chest/nutriment - ) + r_pocket = /obj/item/scythe/tele l_pocket = /obj/item/gun/energy/gun/mini cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/advmop + /obj/item/organ/internal/cyberimp/arm/advmop, + /obj/item/organ/internal/cyberimp/chest/nutriment ) /datum/outfit/job/centcom/response_team/janitorial/gamma diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm index da06ce169f3..4a7e340abb4 100644 --- a/code/modules/security_levels/keycard authentication.dm +++ b/code/modules/security_levels/keycard authentication.dm @@ -166,7 +166,7 @@ if(check_rights(R_EVENT, 0, C.mob)) fullmin_count++ if(fullmin_count) - ert_request_answered = 0 + ert_request_answered = TRUE ERT_Announce(ert_reason , event_triggered_by, 0) ert_reason = "Reason for ERT" feedback_inc("alert_keycard_auth_ert",1)