diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 20beda3422f..7d4db523f20 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -345,7 +345,7 @@ var/override = 0 for(var/datum/spacevine_mutation/SM in mutations) override += SM.on_chem(src, R) - if(!override && istype(R, /datum/reagent/atrazine)) + if(!override && istype(R, /datum/reagent/glyphosate)) if(prob(50)) qdel(src) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 5cdcf52effd..95ee3ae4fdd 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -599,10 +599,10 @@ adjustToxic(round(S.get_reagent_amount("facid") * 3)) adjustWeeds(-rand(1,4)) - // Plant-B-Gone is just as bad - if(S.has_reagent("plantbgone", 1)) - adjustHealth(-round(S.get_reagent_amount("plantbgone") * 5)) - adjustToxic(round(S.get_reagent_amount("plantbgone") * 6)) + // Glyphosate is just as bad + if(S.has_reagent("glyphosate", 1)) + adjustHealth(-round(S.get_reagent_amount("glyphosate") * 5)) + adjustToxic(round(S.get_reagent_amount("glyphosate") * 6)) adjustWeeds(-rand(4,8)) // why, just why diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index f9b5560caed..73109f0f7e5 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -900,25 +900,26 @@ M.adjustFireLoss(1) ..() -/datum/reagent/atrazine - name = "Atrazine" - id = "atrazine" - description = "A herbicidal compound used for destroying unwanted plants." +/datum/reagent/glyphosate + name = "Glyphosate" + id = "glyphosate" + description = "A broad-spectrum herbicide that is highly effective at killing all plants." reagent_state = LIQUID - color = "#17002D" + color = "#d3cf50" + var/lethality = 0 //Glyphosate is non-toxic to people -/datum/reagent/atrazine/on_mob_life(mob/living/M) - M.adjustToxLoss(2) +/datum/reagent/glyphosate/on_mob_life(mob/living/M) + M.adjustToxLoss(lethality) ..() -/datum/reagent/atrazine/reaction_turf(turf/simulated/wall/W, volume) // Clear off wallrot fungi +/datum/reagent/glyphosate/reaction_turf(turf/simulated/wall/W, volume) // Clear off wallrot fungi if(istype(W) && W.rotting) for(var/obj/effect/overlay/wall_rot/WR in W) qdel(WR) W.rotting = 0 W.visible_message("The fungi are completely dissolved by the solution!") -/datum/reagent/atrazine/reaction_obj(obj/O, volume) +/datum/reagent/glyphosate/reaction_obj(obj/O, volume) if(istype(O,/obj/structure/alien/weeds/)) var/obj/structure/alien/weeds/alien_weeds = O alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast @@ -929,11 +930,11 @@ var/obj/effect/spacevine/SV = O SV.on_chem_effect(src) -/datum/reagent/atrazine/reaction_mob(mob/living/M, method=TOUCH, volume) +/datum/reagent/glyphosate/reaction_mob(mob/living/M, method=TOUCH, volume) if(iscarbon(M)) var/mob/living/carbon/C = M if(!C.wear_mask) // If not wearing a mask - C.adjustToxLoss(2) // 2 toxic damage per application + C.adjustToxLoss(lethality) if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.species.flags & IS_PLANT) //plantmen take a LOT of damage @@ -944,6 +945,15 @@ D.adjustHealth(100) ..() +/datum/reagent/glyphosate/atrazine + name = "Atrazine" + id = "atrazine" + description = "A herbicidal compound used for destroying unwanted plants." + reagent_state = LIQUID + color = "#17002D" + lethality = 2 //Atrazine, however, is definitely toxic + + /datum/reagent/pestkiller // To-Do; make this more realistic. name = "Pest Killer" id = "pestkiller" diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index 682217c6c8d..082e209e18b 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -93,6 +93,13 @@ if(C.can_breathe_gas()) C.reagents.add_reagent("sarin", 4) +/datum/chemical_reaction/glyphosate + name = "glyphosate" + id = "glyphosate" + result = "glyphosate" + required_reagents = list("chlorine" = 1, "phosphorus" = 1, "formaldehyde" = 1, "ammonia" = 1) + result_amount = 4 + /datum/chemical_reaction/atrazine name = "atrazine" id = "atrazine" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index f65e4a87dc2..274c3efd623 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -204,4 +204,4 @@ icon_state = "plantbgone" item_state = "plantbgone" volume = 100 - list_reagents = list("atrazine" = 100) \ No newline at end of file + list_reagents = list("glyphosate" = 100) \ No newline at end of file