Merge pull request #23701 from Xhuis/ez_clean

Adds EZ-clean grenades to the uplink
This commit is contained in:
Joan Lung
2017-02-05 20:33:11 -05:00
committed by GitHub
4 changed files with 50 additions and 1 deletions
@@ -381,6 +381,25 @@
beakers += B2
/obj/item/weapon/grenade/chem_grenade/ez_clean
name = "cleaner grenade"
desc = "Waffle Co.-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
stage = READY
/obj/item/weapon/grenade/chem_grenade/ez_clean/New()
..()
var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
B1.reagents.add_reagent("fluorosurfactant", 40)
B2.reagents.add_reagent("water", 40)
B2.reagents.add_reagent("ez_clean", 60) //ensures a t h i c c distribution
beakers += B1
beakers += B2
/obj/item/weapon/grenade/chem_grenade/teargas
name = "teargas grenade"
desc = "Used for nonlethal riot control. Contents under pressure. Do not directly inhale contents."
@@ -301,3 +301,8 @@
new /obj/item/weapon/reagent_containers/glass/bottle/romerol(src)
new /obj/item/weapon/reagent_containers/syringe(src)
new /obj/item/weapon/reagent_containers/dropper(src)
/obj/item/weapon/storage/box/syndie_kit/ez_clean/New()
..()
for(var/i in 1 to 3)
new/obj/item/weapon/grenade/chem_grenade/ez_clean(src)
@@ -214,7 +214,7 @@
name = "Unholy Water"
id = "unholywater"
description = "Something that shouldn't exist on this plane of existence."
/datum/reagent/fuel/unholywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(method == TOUCH || method == VAPOR)
M.reagents.add_reagent("unholywater", (reac_volume/4))
@@ -896,6 +896,23 @@
H.wash_cream()
M.clean_blood()
/datum/reagent/space_cleaner/ez_clean
name = "EZ Clean"
id = "ez_clean"
description = "A powerful, acidic cleaner sold by Waffle Co. Affects organic matter while leaving other objects unaffected."
metabolization_rate = 1.5 * REAGENTS_METABOLISM
/datum/reagent/space_cleaner/ez_clean/on_mob_life(mob/living/M)
M.adjustBruteLoss(3.33)
M.adjustFireLoss(3.33)
M.adjustToxLoss(3.33)
..()
/datum/reagent/space_cleaner/ez_clean/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
..()
if((method == TOUCH || method == VAPOR) && !issilicon(M))
M.adjustBruteLoss(1)
M.adjustFireLoss(1)
/datum/reagent/cryptobiolin
name = "Cryptobiolin"
+8
View File
@@ -1166,6 +1166,14 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
category = "Role-Restricted"
exclude_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/role_restricted/ez_clean_bundle
name = "EZ Clean Grenade Bundle"
desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. The acid only affects carbon-based creatures."
item = /obj/item/weapon/storage/box/syndie_kit/ez_clean
cost = 6
surplus = 20
restricted_roles = list("Janitor")
// Pointless
/datum/uplink_item/badass
category = "(Pointless) Badassery"