mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-14 04:02:31 +00:00
Adds weedkiller smoke checks to hydro trays and spreading plants.
This commit is contained in:
@@ -134,7 +134,7 @@
|
|||||||
verbs |= /obj/item/weapon/rig/proc/toggle_chest
|
verbs |= /obj/item/weapon/rig/proc/toggle_chest
|
||||||
|
|
||||||
for(var/obj/item/piece in list(gloves,helmet,boots,chest))
|
for(var/obj/item/piece in list(gloves,helmet,boots,chest))
|
||||||
if(!piece)
|
if(!istype(piece))
|
||||||
continue
|
continue
|
||||||
piece.canremove = 0
|
piece.canremove = 0
|
||||||
piece.name = "[suit_type] [initial(piece.name)]"
|
piece.name = "[suit_type] [initial(piece.name)]"
|
||||||
@@ -145,7 +145,6 @@
|
|||||||
piece.siemens_coefficient = siemens_coefficient
|
piece.siemens_coefficient = siemens_coefficient
|
||||||
piece.permeability_coefficient = permeability_coefficient
|
piece.permeability_coefficient = permeability_coefficient
|
||||||
piece.unacidable = unacidable
|
piece.unacidable = unacidable
|
||||||
if(islist(species_restricted)) piece.species_restricted = species_restricted.Copy()
|
|
||||||
if(islist(armor)) piece.armor = armor.Copy()
|
if(islist(armor)) piece.armor = armor.Copy()
|
||||||
|
|
||||||
update_icon(1)
|
update_icon(1)
|
||||||
|
|||||||
@@ -35,6 +35,11 @@
|
|||||||
die_off()
|
die_off()
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
|
||||||
|
if(smoke.reagents.has_reagent("plantbgone"))
|
||||||
|
die_off()
|
||||||
|
return
|
||||||
|
|
||||||
// Handle life.
|
// Handle life.
|
||||||
var/turf/simulated/T = get_turf(src)
|
var/turf/simulated/T = get_turf(src)
|
||||||
if(istype(T))
|
if(istype(T))
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
/obj/machinery/portable_atmospherics/hydroponics/process()
|
/obj/machinery/portable_atmospherics/hydroponics/process()
|
||||||
|
|
||||||
|
// Handle nearby smoke if any.
|
||||||
|
for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
|
||||||
|
if(smoke.reagents.total_volume)
|
||||||
|
smoke.reagents.copy_to(src, 5)
|
||||||
|
|
||||||
//Do this even if we're not ready for a plant cycle.
|
//Do this even if we're not ready for a plant cycle.
|
||||||
process_reagents()
|
process_reagents()
|
||||||
|
|
||||||
|
|||||||
@@ -1855,10 +1855,7 @@ datum
|
|||||||
var/obj/effect/alien/weeds/alien_weeds = O
|
var/obj/effect/alien/weeds/alien_weeds = O
|
||||||
alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
|
alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
|
||||||
alien_weeds.healthcheck()
|
alien_weeds.healthcheck()
|
||||||
else if(istype(O,/obj/effect/plant)) //even a small amount is enough to kill it
|
|
||||||
del(O)
|
|
||||||
else if(istype(O,/obj/effect/plant))
|
else if(istype(O,/obj/effect/plant))
|
||||||
if(prob(50))
|
|
||||||
var/obj/effect/plant/plant = O
|
var/obj/effect/plant/plant = O
|
||||||
plant.die_off()
|
plant.die_off()
|
||||||
else if(istype(O,/obj/machinery/portable_atmospherics/hydroponics))
|
else if(istype(O,/obj/machinery/portable_atmospherics/hydroponics))
|
||||||
|
|||||||
Reference in New Issue
Block a user