From 38876ae3f0dc7ee035d9e264e9d489131d49d89d Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 8 May 2016 04:48:10 -0700 Subject: [PATCH] configearmuffs Peacekeeper borgs now have a config option "Harm Alarm" now respects and is blocked by earmuffs Secborg/peaceborg disable config option is now more verbose :^) --- code/controllers/configuration.dm | 3 +++ code/game/objects/items/robot/robot_items.dm | 10 +++++++++- code/modules/mob/living/silicon/robot/robot.dm | 4 +++- config/admins.txt | 1 + config/game_options.txt | 5 ++++- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 067730d32bf..73411581136 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -93,6 +93,7 @@ var/humans_need_surnames = 0 var/allow_ai = 0 // allow ai job var/forbid_secborg = 0 // disallow secborg module to be chosen. + var/forbid_peaceborg = 0 var/panic_bunker = 0 // prevents new people it hasn't seen before from connecting var/notify_new_player_age = 0 // how long do we notify admins of a new player var/irc_first_connection_alert = 0 // do we notify the irc channel when somebody is connecting for the first time? @@ -558,6 +559,8 @@ config.allow_ai = 1 if("disable_secborg") config.forbid_secborg = 1 + if("disable_peaceborg") + config.forbid_peaceborg = 1 if("silent_ai") config.silent_ai = 1 if("silent_borg") diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index e60d2ad182d..a052e3ffe4a 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -178,6 +178,10 @@ if(safety == 1) for(var/mob/living/M in get_hearers_in_view(9, user)) if(iscarbon(M)) + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(istype(H.ears, /obj/item/clothing/ears/earmuffs)) + continue M.confused += 6 M.visible_message("[user] blares out a near-deafening siren from its speakers!", \ "The siren pierces your hearing and confuses you!", \ @@ -195,7 +199,11 @@ if(safety == 0) for(var/mob/living/M in get_hearers_in_view(9, user)) if(iscarbon(M)) - M.confused += 15 + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(istype(H.ears, /obj/item/clothing/ears/earmuffs)) + continue + M.confused += 15 M.Weaken(2) M.stuttering += 30 M.adjustEarDamage(0, 20) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f36b53552c3..e53b3a20f7e 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -166,7 +166,9 @@ if(module) return - var/list/modulelist = list("Standard", "Engineering", "Medical", "Miner", "Janitor","Service","Peacekeeper") + var/list/modulelist = list("Standard", "Engineering", "Medical", "Miner", "Janitor","Service") + if(!config.forbid_peaceborg) + modulelist += "Peacekeeper" if(!config.forbid_secborg) modulelist += "Security" diff --git a/config/admins.txt b/config/admins.txt index 8db72174aa7..b1e04e83c7a 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -8,6 +8,7 @@ # NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # ############################################################################################### Optimumtact = Host +kevinz000 = Host kingofkosmos = Game Master MrStonedOne = Game Master microscopics = Game Master diff --git a/config/game_options.txt b/config/game_options.txt index 767aff019fc..29aa45b56bc 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -197,9 +197,12 @@ EVENTS_MIN_PLAYERS_MUL 1 ALLOW_AI ### Secborg ### -## Uncomment to prevent the secborg module from being chosen +## Uncomment to prevent the security cyborg module from being chosen #DISABLE_SECBORG +### Peacekeeper Borg ### +## Uncomment to prevent the peacekeeper cyborg module from being chosen +#DISABLE_PEACEBORG ### AWAY MISSIONS ###