mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 07:27:57 +01:00
Added hydroponics crates, graphics and crates themselves into the code.
Added Weed-B-Gone into crates at hydro, also Weed-B-Gone functionality. Changed map accordingly. Added weedbgone as a reagent and a recipe for it. Added new spray sound effects and updated/changed those that were used before for fire extinguisher, refueling/refilling, using cleaner and using weed-b-gone. Removed thumbs.db added by TLE as I saw it unnecessary. Added buzzing sound to be used later with Fly Amanitas. Changed some fertilizer graphics in chemical.dmi to be prettier. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@42 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -40,7 +40,7 @@
|
||||
if ((O.client && !( O.blinded )))
|
||||
O << text("\red [src] has been scanned by [user] with the [W]")
|
||||
else
|
||||
if (!( istype(W, /obj/item/weapon/grab) ) || !(istype(W, /obj/item/weapon/cleaner)))
|
||||
if (!( istype(W, /obj/item/weapon/grab) ) || !(istype(W, /obj/item/weapon/cleaner)) || !(istype(W, /obj/item/weapon/weedbgone)) )
|
||||
for(var/mob/O in viewers(src, null))
|
||||
if ((O.client && !( O.blinded )))
|
||||
O << text("\red <B>[] has been hit by [] with []</B>", src, user, W)
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
var/mutmod = 1 //Modifier to mutation chance
|
||||
var/age = 0 // Current age
|
||||
var/dead = 0 // Is it dead?
|
||||
var/health = 0 // It's health.
|
||||
var/health = 0 // Its health.
|
||||
var/lastproduce = 0 // Last time it was harvested
|
||||
var/lastcycle = 0 //Used for timing of cycles.
|
||||
var/cycledelay = 200 // About 10 seconds / cycle
|
||||
@@ -167,6 +167,14 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
|
||||
user << "--<B>Plant Potency:</B> [src.myseed.potency]"
|
||||
else
|
||||
user << "<B>No plant found.</B>"
|
||||
else if (istype(O, /obj/item/weapon/weedbgone))
|
||||
if(src.planted && src.myseed)
|
||||
src.health -= rand(5,50)
|
||||
src.visible_message("\red <B>\The [src] has been sprayed with \the [O][(user ? " by [user]." : ".")]")
|
||||
playsound(src.loc, 'spray3.ogg', 50, 1, -6)
|
||||
else
|
||||
user << "\red Nothing is planted in the hydrotray!"
|
||||
|
||||
|
||||
return
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
var/obj/o = target
|
||||
o.reagents.trans_to(src, 50)
|
||||
user << "\blue Extinguisher refilled"
|
||||
playsound(src.loc, 'zzzt.ogg', 50, 1, -6)
|
||||
playsound(src.loc, 'refill.ogg', 50, 1, -6)
|
||||
return
|
||||
|
||||
if (!safety)
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
src.last_use = world.time
|
||||
|
||||
playsound(src.loc, 'spray.ogg', 75, 1, -3)
|
||||
playsound(src.loc, 'extinguish.ogg', 75, 1, -3)
|
||||
|
||||
var/direction = get_dir(src,target)
|
||||
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
|
||||
CONTAINS:
|
||||
Weed-B-Gone
|
||||
Nettle
|
||||
Deathnettle
|
||||
|
||||
*/
|
||||
/obj/item/weapon/weedbgone/New()
|
||||
var/datum/reagents/R = new/datum/reagents(100) // 100 units of solution
|
||||
reagents = R
|
||||
R.my_atom = src
|
||||
R.add_reagent("weedbgone", 100)
|
||||
|
||||
/obj/item/weapon/weedbgone/attack(mob/living/carbon/human/M as mob, mob/user as mob)
|
||||
return
|
||||
|
||||
/obj/item/weapon/weedbgone/afterattack(atom/A as mob|obj, mob/user as mob)
|
||||
if (src.reagents.total_volume < 1)
|
||||
user << "\blue Add more Weed-B-Gone mixture!"
|
||||
return
|
||||
|
||||
else if (istype(A, /obj/machinery/hydroponics)) // We are targeting hydrotray
|
||||
/* Gotta figure out how to make this work, chemical sprite doesn't appear.
|
||||
var/obj/decal/spraystill/D = new /obj/decal/spraystill( src ) // new decal at tray location
|
||||
D.name = "chemicals"
|
||||
D.icon = 'chemical.dmi'
|
||||
D.icon_state = "weedpuff"
|
||||
|
||||
spawn(0) // spawn on top of tray
|
||||
sleep(3)
|
||||
del(D)
|
||||
|
||||
*/
|
||||
return
|
||||
else
|
||||
var/obj/decal/D = new/obj/decal/(get_turf(src)) // Targeting elsewhere
|
||||
D.name = "chemicals"
|
||||
D.icon = 'chemical.dmi'
|
||||
D.icon_state = "weedpuff"
|
||||
D.create_reagents(5)
|
||||
src.reagents.trans_to(D, 5) // 5 units of solution used at a time => 20 uses
|
||||
playsound(src.loc, 'spray3.ogg', 50, 1, -6)
|
||||
|
||||
spawn(0)
|
||||
for(var/i=0, i<2, i++) // Max range = 2 tiles
|
||||
step_towards(D,A) // Moves towards target as normally (not thru walls)
|
||||
D.reagents.reaction(get_turf(D))
|
||||
for(var/atom/T in get_turf(D))
|
||||
D.reagents.reaction(T)
|
||||
sleep(4)
|
||||
del(D)
|
||||
|
||||
return
|
||||
|
||||
/obj/item/weapon/weedbgone/examine()
|
||||
set src in usr
|
||||
usr << text("\icon[] [] units of Weed-B-Gone left!", src, src.reagents.total_volume)
|
||||
..()
|
||||
return
|
||||
@@ -24,7 +24,7 @@ MOP
|
||||
D.icon_state = "chempuff"
|
||||
D.create_reagents(10)
|
||||
src.reagents.trans_to(D, 10)
|
||||
playsound(src.loc, 'zzzt.ogg', 50, 1, -6)
|
||||
playsound(src.loc, 'spray2.ogg', 50, 1, -6)
|
||||
|
||||
spawn(0)
|
||||
for(var/i=0, i<3, i++)
|
||||
|
||||
@@ -142,7 +142,7 @@ WELDINGTOOOL
|
||||
if (istype(O, /obj/reagent_dispensers/fueltank) && get_dist(src,O) <= 1)
|
||||
O.reagents.trans_to(src, 20)
|
||||
user << "\blue Welder refueled"
|
||||
playsound(src.loc, 'zzzt.ogg', 50, 1, -6)
|
||||
playsound(src.loc, 'refill.ogg', 50, 1, -6)
|
||||
|
||||
else if (src.welding)
|
||||
use_fuel(1)
|
||||
|
||||
@@ -109,6 +109,21 @@
|
||||
var/broken = 0
|
||||
locked = 1
|
||||
|
||||
/obj/crate/hydroponics
|
||||
name = "Gardening crate"
|
||||
desc = "All you need to destroy those pesky weeds and pests."
|
||||
icon = 'storage.dmi'
|
||||
icon_state = "hydrocrate"
|
||||
openicon = "hydrocrateopen"
|
||||
closedicon = "hydrocrate"
|
||||
density = 1
|
||||
New()
|
||||
..()
|
||||
new /obj/item/weapon/weedbgone(src)
|
||||
new /obj/item/weapon/weedbgone(src)
|
||||
new /obj/item/weapon/weedbgone(src)
|
||||
new /obj/item/weapon/weedbgone(src)
|
||||
// Four bottles should be enough for everybody.
|
||||
|
||||
/obj/crate/New()
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user