From 649df8ac912fc7a582d343513c781d64104c8f60 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 27 Oct 2013 12:11:48 -0400 Subject: [PATCH] Rebalance Update Rebalanced Traitors, HoP, and Reagents; added new traitor item. --- code/datums/uplink_item.dm | 8 +++++- code/game/gamemodes/changeling/changeling.dm | 2 +- .../gamemodes/changeling/modularchangling.dm | 4 +-- code/game/gamemodes/cult/cult.dm | 2 +- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gamemodes/traitor/traitor.dm | 2 +- code/game/jobs/job/captain.dm | 12 ++++++++ code/game/jobs/job/civilian_chaplain.dm | 5 ++-- code/game/mecha/mech_fabricator.dm | 5 +++- code/modules/reagents/Chemistry-Reagents.dm | 25 +++++++++++++++++ code/modules/reagents/Chemistry-Recipes.dm | 28 +++++++++++++++---- 11 files changed, 79 insertions(+), 16 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 209faa93404..42dac133bfd 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -192,7 +192,7 @@ var/list/uplink_items = list() name = "Energy Crossbow" desc = "A miniature energy crossbow that is small enough both to fit into a pocket and to slip into a backpack unnoticed by observers. Fires bolts tipped with toxin, a poisonous substance that is the product of a living organism. Stuns enemies for a short period of time. Recharges automatically." item = /obj/item/weapon/gun/energy/crossbow - cost = 5 + cost = 7 /datum/uplink_item/dangerous/sword name = "Energy Sword" @@ -200,6 +200,12 @@ var/list/uplink_items = list() item = /obj/item/weapon/melee/energy/sword cost = 4 +/datum/uplink_item/dangerous/manhacks + name = "Manhack Delivery Grenade" + desc = "The manhack grenade is a highly specialized grenades that, once thrown, will deploy a swarm of Viscerators to attack any nearby crewmembers. WARNING: Viscerator progrmaming does not include safeties. They may turn on you!" + item = /obj/item/weapon/grenade/spawnergrenade/manhacks + cost = 7 + /datum/uplink_item/dangerous/emp name = "5 EMP Grenades" desc = "A box that contains 5 EMP grenades. Useful to disrupt communication and silicon lifeforms." diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 1049967c451..7b72fc1353f 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -8,7 +8,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" name = "changeling" config_tag = "changeling" restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield") required_players = 2 required_players_secret = 10 required_enemies = 1 diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm index 2395e63b270..099d805c056 100644 --- a/code/game/gamemodes/changeling/modularchangling.dm +++ b/code/game/gamemodes/changeling/modularchangling.dm @@ -74,7 +74,7 @@ var/list/datum/power/changeling/powerinstances = list() name = "Silence Sting" desc = "We silently sting a human, completely silencing them for a short time." helptext = "Does not provide a warning to a victim that they have been stung, until they try to speak and cannot." - genomecost = 2 + genomecost = 3 allowduringlesserform = 1 verbpath = /mob/proc/changeling_silence_sting @@ -103,7 +103,7 @@ var/list/datum/power/changeling/powerinstances = list() /datum/power/changeling/paralysis_sting name = "Paralysis Sting" desc = "We silently sting a human, paralyzing them for a short time." - genomecost = 3 + genomecost = 4 verbpath = /mob/proc/changeling_paralysis_sting /datum/power/changeling/LSDSting diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 9f46b312e8b..59d4734b200 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -20,7 +20,7 @@ /datum/game_mode/cult name = "cult" config_tag = "cult" - restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") + restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield") protected_jobs = list() required_players = 5 required_players_secret = 15 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index bc750dd9b36..c852c6e7aaf 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -14,7 +14,7 @@ /datum/game_mode/revolution name = "revolution" config_tag = "revolution" - restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") + restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Blueshield") required_players = 4 required_players_secret = 15 required_enemies = 3 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 6014a37685f..cb3ca41dc8a 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -8,7 +8,7 @@ name = "traitor" config_tag = "traitor" restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")//AI", Currently out of the list as malf does not work for shit + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield")//AI", Currently out of the list as malf does not work for shit required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 375983c87da..e8ae28b2b96 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -86,6 +86,12 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) + L.imp_in = H + L.implanted = 1 + var/datum/organ/external/affected = H.organs_by_name["head"] + affected.implants += L + L.part = affected return 1 @@ -130,6 +136,9 @@ var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + var/datum/organ/external/affected = H.organs_by_name["head"] + affected.implants += L + L.part = affected return 1 /datum/job/blueshield @@ -173,4 +182,7 @@ var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 + var/datum/organ/external/affected = H.organs_by_name["head"] + affected.implants += L + L.part = affected return 1 \ No newline at end of file diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 2a31885c801..bce998b67b8 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -10,7 +10,6 @@ selection_color = "#dddddd" access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels) minimal_access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels) - alt_titles = list("Counselor","Pastor","Space Shaman") equip(var/mob/living/carbon/human/H) @@ -34,7 +33,7 @@ switch(lowertext(new_religion)) if("christianity") - B.name = pick("The Holy Bible","The Dead Sea Scrolls") + B.name = pick("The Holy Bible") if("satanism") B.name = "The Unholy Bible" if("cthulu") @@ -48,7 +47,7 @@ if("imperium") B.name = "Uplifting Primer" if("toolboxia") - B.name = "Toolbox Manifesto" + B.name = "Toolbox Manifesto Robusto" if("homosexuality") B.name = "Guys Gone Wild" if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks") diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 664142a345c..ee98ab1b766 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -44,7 +44,10 @@ /obj/item/robot_parts/l_arm, /obj/item/robot_parts/r_arm, /obj/item/robot_parts/l_leg, - /obj/item/robot_parts/r_leg, + /obj/item/robot_parts/r_leg + ), + +"Robot Repair"=list( /obj/item/robot_parts/robot_component/binary_communication_device, /obj/item/robot_parts/robot_component/radio, /obj/item/robot_parts/robot_component/actuator, diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index cf0761eba3f..a00747f5f13 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -3547,7 +3547,32 @@ datum else if(data >= 115 && prob(33)) M.confused = max(M.confused+15,15) ..() + return + + +//Fox +/////////////////Requires Further Balance Testing////////////////// +/* + lectrazine + name = "Lectrazine" + id = "lectrazine" + description = "An extremly powerful cardiostimulant and analgesic which is used in revival of deceased." + reagent_state = LIQUID + color = "#080000" + custom_metabolism = 0.1 + + reaction_mob(var/mob/living/carbon/M as mob, var/methode=INGEST) + if(!M) M = holder.my_atom + M.stat = CONSCIOUS + M.setOxyLoss(0) + M.heal_organ_damage(15,0) + M.SetParalysis(15) + M.adjustBrainLoss(10*REM) + return + +*/ + /* //Grutor diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 85a4d8f2658..2ed331d11a6 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -315,8 +315,8 @@ datum name = "Glycerol" id = "glycerol" result = "glycerol" - required_reagents = list("cornoil" = 3, "sacid" = 1) - result_amount = 1 + required_reagents = list("cornoil" = 3, "sacid" = 2) + result_amount = 5 nitroglycerin name = "Nitroglycerin" @@ -455,8 +455,8 @@ datum name = "Zombie Powder" id = "zombiepowder" result = "zombiepowder" - required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5) - result_amount = 2 + required_reagents = list("carpotoxin" = 1, "stoxin" = 1, "copper" = 1) + result_amount = 3 rezadone name = "Rezadone" @@ -1961,10 +1961,26 @@ datum required_reagents = list("spacemountainwind" = 1, "coffee" = 1) result_amount = 2 + + +//Fox +///////////////////////Requires Balance Testing/////////////////// +/* + lectrazine + name = "Lectrazine" + id = "lectrazine" + result = "lectrazine" + required_reagents = list("inaprovaline" = 1, "phosphorus" = 1) + required_catalysts = list("silver" = 5) + result_amount = 2 + +*/ + + //Grutor ///////////////////////Zombie recipes//////////////////////////// - necrocure + /* necrocure name = "Zombie Cure" id = "necrocure" result = "necrocure" @@ -1978,4 +1994,6 @@ datum required_reagents = list("zombiepowder" = 2, "cryptobiolin" = 2, "mutagen" = 2) result_amount = 5 + */ +