From 58413c4b54a697759c13d4891fbbf184a071dec7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 24 Feb 2018 09:35:48 -0600 Subject: [PATCH] [MIRROR] Renames various reagent IDs to be more descriptive (#5634) * Renames various reagent IDs to be more descriptive (#35824) * changes chloral2/beer2 names, fixes chloral2 desc * reverts chloral2 name/desc, renames ling adrenals * caPITALIZATION * Renames various reagent IDs to be more descriptive * fixes compile issues with Travis --- .../cit_crewobjectives_civilian.dm | 2 +- .../cit_crewobjectives_medical.dm | 2 +- code/game/objects/items/RSF.dm | 2 +- .../changeling/powers/adrenaline.dm | 4 +-- code/modules/paperwork/pen.dm | 2 +- .../chemistry/reagents/medicine_reagents.dm | 26 +++++++++---------- .../chemistry/reagents/toxin_reagents.dm | 10 +++---- .../reagents/reagent_containers/borghydro.dm | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm index c0e6cf6bb1..b714d0cab4 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm @@ -9,7 +9,7 @@ /datum/objective/crew/druglordbot/New() . = ..() target_amount = rand(3,20) - var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingAdrenaline, /datum/reagent/medicine/changelingAdrenaline2) + var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingadrenaline, /datum/reagent/medicine/changelinghaste) var/drugs = typesof(/datum/reagent/drug) - blacklist var/meds = typesof(/datum/reagent/medicine) - blacklist var/chemlist = drugs + meds diff --git a/code/citadel/crew_objectives/cit_crewobjectives_medical.dm b/code/citadel/crew_objectives/cit_crewobjectives_medical.dm index 21d7a040aa..aad6e95df4 100644 --- a/code/citadel/crew_objectives/cit_crewobjectives_medical.dm +++ b/code/citadel/crew_objectives/cit_crewobjectives_medical.dm @@ -19,7 +19,7 @@ /datum/objective/crew/chems/New() . = ..() - var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/nicotine, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/omnizine, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/earthsblood, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingAdrenaline, /datum/reagent/medicine/changelingAdrenaline2) + var/blacklist = list(/datum/reagent/drug, /datum/reagent/drug/nicotine, /datum/reagent/drug/menthol, /datum/reagent/medicine, /datum/reagent/medicine/adminordrazine, /datum/reagent/medicine/adminordrazine/nanites, /datum/reagent/medicine/mine_salve, /datum/reagent/medicine/omnizine, /datum/reagent/medicine/syndicate_nanites, /datum/reagent/medicine/earthsblood, /datum/reagent/medicine/strange_reagent, /datum/reagent/medicine/miningnanites, /datum/reagent/medicine/changelingadrenaline, /datum/reagent/medicine/changelinghaste) var/drugs = typesof(/datum/reagent/drug) - blacklist var/meds = typesof(/datum/reagent/medicine) - blacklist var/chemlist = drugs + meds diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index 42d2b3dc45..b894cf8ee5 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -178,7 +178,7 @@ RSF to_chat(user, "Fabricating Cookie..") var/obj/item/reagent_containers/food/snacks/cookie/S = new /obj/item/reagent_containers/food/snacks/cookie(T) if(toxin) - S.reagents.add_reagent("chloralhydrate2", 10) + S.reagents.add_reagent("chloralhydratedelayed", 10) if (iscyborg(user)) var/mob/living/silicon/robot/R = user R.cell.charge -= 100 diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm index cc001ba85a..34d6e3605b 100644 --- a/code/modules/antagonists/changeling/powers/adrenaline.dm +++ b/code/modules/antagonists/changeling/powers/adrenaline.dm @@ -14,8 +14,8 @@ user.SetUnconscious(0) user.SetStun(0) user.SetKnockdown(0) - user.reagents.add_reagent("changelingAdrenaline", 10) - user.reagents.add_reagent("changelingAdrenaline2", 2) //For a really quick burst of speed + user.reagents.add_reagent("changelingadrenaline", 10) + user.reagents.add_reagent("changelinghaste", 2) //For a really quick burst of speed user.adjustStaminaLoss(-75) return TRUE diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 2a6c92752a..118c69b404 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -167,7 +167,7 @@ /obj/item/pen/sleepy/Initialize() . = ..() create_reagents(45) - reagents.add_reagent("chloralhydrate2", 20) + reagents.add_reagent("chloralhydratedelayed", 20) reagents.add_reagent("mutetoxin", 15) reagents.add_reagent("tirizene", 10) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 7752d70486..2552bb7c8d 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1141,14 +1141,14 @@ . = 1 //used for changeling's adrenaline power -/datum/reagent/medicine/changelingAdrenaline - name = "Adrenaline" - id = "changelingAdrenaline" - description = "Reduces stun times. Also deals toxin damage at high amounts." +/datum/reagent/medicine/changelingadrenaline + name = "Changeling Adrenaline" + id = "changelingadrenaline" + description = "Reduces the duration of unconciousness, knockdown and stuns. Restores stamina, but deals toxin damage when overdosed." color = "#C8A5DC" overdose_threshold = 30 -/datum/reagent/medicine/changelingAdrenaline/on_mob_life(mob/living/M as mob) +/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/M as mob) M.AdjustUnconscious(-20, 0) M.AdjustStun(-20, 0) M.AdjustKnockdown(-20, 0) @@ -1156,31 +1156,31 @@ . = 1 ..() -/datum/reagent/medicine/changelingAdrenaline/overdose_process(mob/living/M as mob) +/datum/reagent/medicine/changelingadrenaline/overdose_process(mob/living/M as mob) M.adjustToxLoss(1, 0) . = 1 ..() -/datum/reagent/medicine/changelingAdrenaline2 - name = "Adrenaline" - id = "changelingAdrenaline2" - description = "Drastically increases movement speed." +/datum/reagent/medicine/changelinghaste + name = "Changeling Haste" + id = "changelinghaste" + description = "Drastically increases movement speed, but deals toxin damage." color = "#C8A5DC" metabolization_rate = 1 -/datum/reagent/medicine/changelingAdrenaline2/on_mob_add(mob/M) +/datum/reagent/medicine/changelinghaste/on_mob_add(mob/M) ..() if(isliving(M)) var/mob/living/L = M L.add_trait(TRAIT_GOTTAGOREALLYFAST, id) -/datum/reagent/medicine/changelingAdrenaline2/on_mob_delete(mob/M) +/datum/reagent/medicine/changelinghaste/on_mob_delete(mob/M) if(isliving(M)) var/mob/living/L = M L.remove_trait(TRAIT_GOTTAGOREALLYFAST, id) ..() -/datum/reagent/medicine/changelingAdrenaline2/on_mob_life(mob/living/M as mob) +/datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/M as mob) M.adjustToxLoss(2, 0) . = 1 ..() diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 6ede798e0b..aba6f580ef 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -291,9 +291,9 @@ . = 1 ..() -/datum/reagent/toxin/chloralhydratedelayed +/datum/reagent/toxin/chloralhydratedelayed //sedates half as quickly and does not cause toxloss. same name/desc so it doesn't give away sleepypens name = "Chloral Hydrate" - id = "chloralhydrate2" + id = "chloralhydratedelayed" description = "A powerful sedative that induces confusion and drowsiness before putting its target to sleep." reagent_state = SOLID color = "#000067" // rgb: 0, 0, 103 @@ -309,9 +309,9 @@ M.Sleeping(40, 0) ..() -/datum/reagent/toxin/beer2 //disguised as normal beer for use by emagged brobots +/datum/reagent/toxin/fakebeer //disguised as normal beer for use by emagged brobots name = "Beer" - id = "beer2" + id = "fakebeer" description = "A specially-engineered sedative disguised as beer. It induces instant sleep in its target." color = "#664300" // rgb: 102, 67, 0 metabolization_rate = 1.5 * REAGENTS_METABOLISM @@ -320,7 +320,7 @@ glass_name = "glass of beer" glass_desc = "A freezing pint of beer." -/datum/reagent/toxin/beer2/on_mob_life(mob/living/M) +/datum/reagent/toxin/fakebeer/on_mob_life(mob/living/M) switch(current_cycle) if(1 to 50) M.Sleeping(40, 0) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index edd0096935..b4116a2915 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -220,7 +220,7 @@ Borg Shaker recharge_time = 3 accepts_reagent_upgrades = FALSE - reagent_ids = list("beer2") + reagent_ids = list("fakebeer") /obj/item/reagent_containers/borghypo/peace name = "Peace Hypospray"