removal of peacekeeper

This commit is contained in:
Fox McCloud
2021-09-17 22:04:28 -04:00
parent 338eb1963e
commit b38a1e2fd7
8 changed files with 3 additions and 209 deletions
@@ -368,11 +368,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
module_sprites["Cricket"] = "Cricket-SEC"
status_flags &= ~CANPUSH
if("Peacekeeper")
module = new /obj/item/robot_module/peacekeeper(src)
module_sprites["Peacekeeper"] = "peace"
status_flags &= ~CANPUSH
if("Engineering")
module = new /obj/item/robot_module/engineering(src)
module.channels = list("Engineering" = 1)
@@ -425,7 +420,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
SSblackbox.record_feedback("tally", "cyborg_modtype", 1, "[lowertext(modtype)]")
rename_character(real_name, get_default_name())
if(modtype == "Medical" || modtype == "Security" || modtype == "Peacekeeper" || modtype == "Combat")
if(modtype == "Medical" || modtype == "Security" || modtype == "Combat")
status_flags &= ~CANPUSH
choose_icon(6,module_sprites)
@@ -1335,7 +1330,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
scrambledcodes = 1
req_one_access = list(ACCESS_CENT_SPECOPS)
ionpulse = 1
force_modules = list("Engineering", "Medical", "Security")
force_modules = list("Engineering", "Medical")
static_radio_channels = 1
allow_rename = FALSE
weapons_unlock = TRUE
@@ -278,7 +278,7 @@
/obj/item/borg_defib,
/obj/item/handheld_defibrillator,
/obj/item/roller_holder,
/obj/item/borg/cyborghug/medical,
/obj/item/borg/cyborghug,
/obj/item/reagent_containers/borghypo,
/obj/item/scalpel/laser/laser1,
/obj/item/hemostat,
@@ -362,21 +362,6 @@
if(G)
G.drop_gripped_item(silent = TRUE)
// Peacekeeper cyborg module.
/obj/item/robot_module/peacekeeper
name = "Peacekeeper"
module_type = "Standard"
basic_modules = list(
/obj/item/cookiesynth,
/obj/item/harmalarm,
/obj/item/reagent_containers/borghypo/peace,
/obj/item/holosign_creator/cyborg,
/obj/item/borg/cyborghug/peacekeeper,
/obj/item/extinguisher
/* /obj/item/borg/projectile_dampen*/)
emag_modules = list(/obj/item/reagent_containers/borghypo/peace/hacked)
// Security cyborg module.
/obj/item/robot_module/security
name = "security robot module"
@@ -559,12 +559,6 @@
REMOVE_TRAIT(M, TRAIT_PACIFISM, id)
..()
/datum/reagent/pax/peaceborg
name = "synthpax"
id = "synthpax"
description = "A colorless liquid that suppresses violence in its subjects. Cheaper to synthesize than normal Pax, but wears off faster."
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/toxin/coffeepowder
name = "Coffee Grounds"
id = "coffeepowder"
@@ -1273,33 +1273,6 @@
..()
chosen_timer = rand(10, 30)
/datum/reagent/peaceborg/confuse
name = "Dizzying Solution"
id = "dizzysolution"
description = "Makes the target off balance and dizzy"
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/M)
M.AdjustConfused(3, bound_lower = 0, bound_upper = 5)
M.AdjustDizzy(3, bound_lower = 0, bound_upper = 5)
if(prob(20))
to_chat(M, "<span class='warning'>You feel confused and disorientated.</span>")
return ..()
/datum/reagent/peaceborg/tire
name = "Tiring Solution"
id = "tiresolution"
description = "An extremely weak stamina-toxin that tires out the target. Completely harmless."
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/peaceborg/tire/on_mob_life(mob/living/M)
var/healthcomp = (M.maxHealth - M.health)
if(M.staminaloss < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
M.adjustStaminaLoss(10)
if(prob(30))
to_chat(M, "<span class='warning'>You feel like you should sit down and take a rest...</span>")
return ..()
/datum/reagent/gluttonytoxin
name = "Gluttony's Blessing"
id = "gluttonytoxin"
@@ -34,15 +34,6 @@
reagent_ids = list("syndicate_nanites", "potass_iodide", "hydrocodone")
bypass_protection = 1
/obj/item/reagent_containers/borghypo/peace
name = "Peace Hypospray"
reagent_ids = list("dizzysolution", "tiresolution", "synthpax")
/obj/item/reagent_containers/borghypo/peace/hacked
desc = "Everything's peaceful in death!"
icon_state = "borghypo_s"
reagent_ids = list("dizzysolution", "tiresolution", "synthpax", "tirizene", "sulfonal", "sodium_thiopental", "cyanide", "neurotoxin2")
/obj/item/reagent_containers/borghypo/New()
..()
for(var/R in reagent_ids)