cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7277 from pudl/chemfix

Browse Source 
replaces all instances of pacid with facid
This commit is contained in:
hornygranny
2015-01-22 17:06:46 -08:00
parent cc11078fa7 c6b488a7c0
commit 22e96d3377
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/rechargestation.dm
View File

@@ -188,7 +188,7 @@
if(R.module.emag)
if(istype(R.module.emag, /obj/item/weapon/reagent_containers/spray))
var/obj/item/weapon/reagent_containers/spray/S = R.module.emag
if(S.name == "polyacid spray")
S.reagents.add_reagent("pacid", 2 * coeff)
if(S.name == "Fluacid spray")
S.reagents.add_reagent("facid", 2 * coeff)
else if(S.name == "lube spray")
S.reagents.add_reagent("lube", 2 * coeff)

2
code/game/objects/items/toys.dm
View File

@@ -54,7 +54,7 @@
if(O.reagents.total_volume < 1)
user << "The [O] is empty."
else if(O.reagents.total_volume >= 1)
if(O.reagents.has_reagent("pacid", 1))
if(O.reagents.has_reagent("facid", 1))
user << "The acid chews through the balloon!"
O.reagents.reaction(user)
qdel(src)

8
code/game/objects/items/weapons/grenades/chem_grenade.dm
View File

@@ -268,7 +268,7 @@
B1.reagents.add_reagent("aluminium", 30)
B2.reagents.add_reagent("foaming_agent", 10)
B2.reagents.add_reagent("pacid", 10)
B2.reagents.add_reagent("facid", 10)
beakers += B1
beakers += B2
@@ -353,17 +353,17 @@
icon_state = "grenade"
/obj/item/weapon/grenade/chem_grenade/pacid
/obj/item/weapon/grenade/chem_grenade/facid
name = "acid grenade"
desc = "Used for melting armoured opponents."
stage = READY
/obj/item/weapon/grenade/chem_grenade/pacid/New()
/obj/item/weapon/grenade/chem_grenade/facid/New()
..()
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("pacid", 100)
B1.reagents.add_reagent("facid", 100)
B1.reagents.add_reagent("potassium", 25)
B2.reagents.add_reagent("phosphorus", 25)
B2.reagents.add_reagent("sugar", 25)

2
code/modules/events/vent_clog.dm
View File

@@ -28,7 +28,7 @@
var/obj/vent = pick_n_take(vents)
if(vent && vent.loc)
var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","mushroomhallucinogen","lube",
"plantbgone","banana","charcoal","space_drugs","morphine","holywater","ethanol","hot_coco","pacid")
"plantbgone","banana","charcoal","space_drugs","morphine","holywater","ethanol","hot_coco","facid")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = vent
R.add_reagent(pick(gunk), 50)

2
code/modules/hydroponics/growninedible.dm
View File

@@ -224,7 +224,7 @@
/obj/item/weapon/grown/nettle/death/add_juice()
..()
reagents.add_reagent("pacid", round((potency / 2), 1))
reagents.add_reagent("facid", round((potency / 2), 1))
force = round((5 + potency / 2.5), 1)
/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user as mob)

6
code/modules/hydroponics/hydroponics.dm
View File

@@ -512,9 +512,9 @@ obj/machinery/hydroponics/proc/applyChemicals(var/datum/reagents/S)
adjustWeeds(-rand(1,2))
// SERIOUSLY
if(S.has_reagent("pacid", 1))
adjustHealth(-round(S.get_reagent_amount("pacid") * 2))
adjustToxic(round(S.get_reagent_amount("pacid") * 3))
if(S.has_reagent("facid", 1))
adjustHealth(-round(S.get_reagent_amount("facid") * 2))
adjustToxic(round(S.get_reagent_amount("facid") * 3))
adjustWeeds(-rand(1,4))
// Plant-B-Gone is just as bad

2
code/modules/mob/living/carbon/human/human_helpers.dm
View File

@@ -47,7 +47,7 @@
return id_name
return "Unknown"
//Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when polyacided or when updating a human's name variable
//Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when Fluacided or when updating a human's name variable
/mob/living/carbon/human/proc/get_face_name(if_no_face="Unknown")
if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible
return if_no_face

4
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -90,8 +90,8 @@
modules += new /obj/item/weapon/extinguisher/mini(src)
emag = new /obj/item/weapon/reagent_containers/spray(src)
emag.reagents.add_reagent("pacid", 250)
emag.name = "polyacid spray"
emag.reagents.add_reagent("facid", 250)
emag.name = "Fluacid spray"
var/obj/item/weapon/reagent_containers/spray/S = emag
S.banned_reagents = list()

2
code/modules/projectiles/projectile/bullets.dm
View File

@@ -134,7 +134,7 @@
..()
reagents.add_reagent("aluminium", 15)
reagents.add_reagent("foaming_agent", 5)
reagents.add_reagent("pacid", 5)
reagents.add_reagent("facid", 5)
//This one is for future syringe guns update
/obj/item/projectile/bullet/dart/syringe

2
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -857,7 +857,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
/obj/item/stack/sheet/mineral/silver = list("silver" = 20),
/obj/item/stack/sheet/mineral/gold = list("gold" = 20),
/obj/item/weapon/grown/nettle/basic = list("sacid" = 0),
/obj/item/weapon/grown/nettle/death = list("pacid" = 0),
/obj/item/weapon/grown/nettle/death = list("facid" = 0),
/obj/item/weapon/grown/novaflower = list("capsaicin" = 0, "condensedcapsaicin" = 0),
//Crayons (for overriding colours)

2
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -635,7 +635,7 @@ datum/chemical_reaction/pestkiller
name = "Slime Teleport"
id = "m_tele"
result = null
required_reagents = list("pacid" = 2, "mutagen" = 2)
required_reagents = list("facid" = 2, "mutagen" = 2)
required_catalysts = list("plasma" = 1)
result_amount = 1
required_container = /obj/item/slime_core

8
code/modules/reagents/reagent_containers/glass/bottle.dm
View File

@@ -98,11 +98,11 @@
icon_state = "bottle17"
spawned_reagent = "diethylamine"
/obj/item/weapon/reagent_containers/glass/bottle/pacid
name = "Polytrinic Acid Bottle"
desc = "A small bottle. Contains a small amount of Polytrinic Acid"
/obj/item/weapon/reagent_containers/glass/bottle/facid
name = "Fluorosulfuric Acid Bottle"
desc = "A small bottle. Contains a small amount of Fluorosulfuric Acid"
icon_state = "bottle17"
spawned_reagent = "pacid"
spawned_reagent = "facid"
/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine
name = "Adminordrazine Bottle"

8
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -15,7 +15,7 @@
amount_per_transfer_from_this = 5
volume = 250
possible_transfer_amounts = null
banned_reagents = list("pacid","sacid")
banned_reagents = list("facid","sacid")
/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob)
@@ -52,9 +52,9 @@
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
log_game("[key_name(user)] fired sulphuric acid from \a [src].")
if(reagents.has_reagent("pacid"))
message_admins("[key_name_admin(user)] fired Polyacid from \a [src].")
log_game("[key_name(user)] fired Polyacid from \a [src].")
if(reagents.has_reagent("facid"))
message_admins("[key_name_admin(user)] fired Fluacid from \a [src].")
log_game("[key_name(user)] fired Fluacid from \a [src].")
if(reagents.has_reagent("lube"))
message_admins("[key_name_admin(user)] fired Space lube from \a [src].")
log_game("[key_name(user)] fired Space lube from \a [src].")