cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds weedkiller smoke checks to hydro trays and spreading plants.

Browse Source
This commit is contained in:
Zuhayr
2015-04-01 07:25:09 -07:00
parent 5326abb67d
commit 1070a8f63c
5 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/clothing/spacesuits/rig/rig.dm
View File

@@ -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)

5
code/modules/hydroponics/spreading/spreading_growth.dm
View File

@@ -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))

32
code/modules/hydroponics/trays/tray.dm
View File

@@ -98,22 +98,22 @@
// Beneficial reagents also have values for modifying yield_mod and mut_mod (in that order). // Beneficial reagents also have values for modifying yield_mod and mut_mod (in that order).
var/global/list/beneficial_reagents = list( var/global/list/beneficial_reagents = list(
"beer" = list( -0.05, 0, 0 ), "beer" = list( -0.05, 0, 0 ),
"fluorine" = list( -2, 0, 0 ), "fluorine" = list( -2, 0, 0 ),
"chlorine" = list( -1, 0, 0 ), "chlorine" = list( -1, 0, 0 ),
"phosphorus" = list( -0.75, 0, 0 ), "phosphorus" = list( -0.75, 0, 0 ),
"sodawater" = list( 0.1, 0, 0 ), "sodawater" = list( 0.1, 0, 0 ),
"sacid" = list( -1, 0, 0 ), "sacid" = list( -1, 0, 0 ),
"pacid" = list( -2, 0, 0 ), "pacid" = list( -2, 0, 0 ),
"plantbgone" = list( -2, 0, 0.2 ), "plantbgone" = list( -2, 0, 0.2),
"cryoxadone" = list( 3, 0, 0 ), "cryoxadone" = list( 3, 0, 0 ),
"ammonia" = list( 0.5, 0, 0 ), "ammonia" = list( 0.5, 0, 0 ),
"diethylamine" = list( 1, 0, 0 ), "diethylamine" = list( 1, 0, 0 ),
"nutriment" = list( 0.5, 0.1, 0 ), "nutriment" = list( 0.5, 0.1, 0 ),
"radium" = list( -1.5, 0, 0.2 ), "radium" = list( -1.5, 0, 0.2),
"adminordrazine" = list( 1, 1, 1 ), "adminordrazine" = list( 1, 1, 1 ),
"robustharvest" = list( 0, 0.2, 0 ), "robustharvest" = list( 0, 0.2, 0 ),
"left4zed" = list( 0, 0, 0.2 ) "left4zed" = list( 0, 0, 0.2)
) )
// Mutagen list specifies minimum value for the mutation to take place, rather // Mutagen list specifies minimum value for the mutation to take place, rather

5
code/modules/hydroponics/trays/tray_process.dm
View File

@@ -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()

7
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -1855,12 +1855,9 @@ 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))
var/obj/machinery/portable_atmospherics/hydroponics/tray = O var/obj/machinery/portable_atmospherics/hydroponics/tray = O