mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
-Increased the amount of units the sprayer used to make water slippery again.
-Added a verb to empty the contents of the sprayer onto the floor. -Admin spawnable only poisonousness apple added. -Apples will always be eaten in one bite, to balance it, the apple can only hold 20 reagents now. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5104 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -706,6 +706,23 @@
|
||||
plant_type = 0
|
||||
growthstages = 6
|
||||
|
||||
/obj/item/seeds/poisonedappleseed
|
||||
name = "pack of apple seeds"
|
||||
desc = "These seeds grow into apple trees."
|
||||
icon_state = "seed-apple"
|
||||
mypath = "/obj/item/seeds/poisonedappleseed"
|
||||
species = "apple"
|
||||
plantname = "Apple Tree"
|
||||
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned"
|
||||
lifespan = 55
|
||||
endurance = 35
|
||||
maturation = 6
|
||||
production = 6
|
||||
yield = 5
|
||||
potency = 10
|
||||
plant_type = 0
|
||||
growthstages = 6
|
||||
|
||||
/obj/item/seeds/goldappleseed
|
||||
name = "pack of golden apple seeds"
|
||||
desc = "These seeds grow into golden apple trees. Good thing there are no firebirds in space."
|
||||
|
||||
@@ -333,8 +333,22 @@
|
||||
New()
|
||||
..()
|
||||
spawn(5) //So potency can be set in the proc that creates these crops
|
||||
reagents.maximum_volume = 20
|
||||
reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
|
||||
bitesize = 1+round(reagents.total_volume / 2, 1)
|
||||
bitesize = reagents.maximum_volume // Always eat the apple in one
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/apple/poisoned
|
||||
seed = "/obj/item/seeds/poisonedappleseed"
|
||||
name = "apple"
|
||||
desc = "It's a little piece of Eden."
|
||||
icon_state = "apple"
|
||||
potency = 15
|
||||
New()
|
||||
..()
|
||||
spawn(5) //So potency can be set in the proc that creates these crops
|
||||
reagents.maximum_volume = 20
|
||||
reagents.add_reagent("cyanide", 1+round((potency / 5), 1))
|
||||
bitesize = reagents.maximum_volume // Always eat the apple in one
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple
|
||||
seed = "/obj/item/seeds/goldappleseed"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
w_class = 2.0
|
||||
throw_speed = 2
|
||||
throw_range = 10
|
||||
amount_per_transfer_from_this = 5
|
||||
amount_per_transfer_from_this = 10
|
||||
volume = 250
|
||||
possible_transfer_amounts = null
|
||||
|
||||
@@ -79,6 +79,16 @@
|
||||
usr << "[round(R.volume)] units of [R.name] left."
|
||||
return
|
||||
|
||||
/obj/item/weapon/reagent_containers/spray/verb/empty()
|
||||
|
||||
set name = "Empty Spray Bottle"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
|
||||
if(isturf(usr.loc))
|
||||
usr << "<span class='notice'>You empty the [src] onto the floor.</span>"
|
||||
reagents.reaction(usr.loc)
|
||||
spawn(5) src.reagents.clear_reagents()
|
||||
|
||||
//space cleaner
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner
|
||||
|
||||
@@ -59,6 +59,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Medical Cyborgs no longer lose the reagents in their hypospray when switching modes.</li>
|
||||
<li class="rscadd">Spaceacillin will now help stop the spread of diseases.</li>
|
||||
<li class="tweak">You can once again make floors slippery by spraying water. This was done by increasing the amount the sprayer uses, which is from 5 to 10. You can also empty your sprayer's contents onto the floor with a verb in the Object tab.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user