cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 09:08:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes merge issue with killer tomatoes

Browse Source 
fixes soap
This commit is contained in:
Cheridan
2014-07-07 13:59:59 -05:00
parent 91985e082d
commit 0aae810b87
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/clown_items.dm
+1 -1
View File
@@ -8,7 +8,7 @@
* Soap
*/
/obj/item/weapon/soap
/obj/item/weapon/soap
name = "soap"
desc = "A cheap bar of soap. Doesn't smell."
gender = PLURAL
code/modules/hydroponics/grown.dm
+11 -12
View File
@@ -634,14 +634,16 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user as mob)
if(istype(user.loc,/turf/space))
return
var/mob/living/simple_animal/hostile/killertomato/K = new /mob/living/simple_animal/hostile/killertomato(user.loc)
user << "<span class='notice'>You begin to awaken the Killer Tomato.</span>"
sleep(30)
var/mob/living/simple_animal/hostile/killertomato/K = new /mob/living/simple_animal/hostile/killertomato(src.loc)
K.maxHealth += round(endurance / 3)
K.melee_damage_lower += round(potency / 10)
K.melee_damage_upper += round(potency / 10)
K.move_to_delay -= round(production / 50)
K.health = K.maxHealth
qdel(src)
user << "<span class='notice'>You plant the killer-tomato.</span>"
K.visible_message("<span class='notice'>The Killer Tomato growls as it suddenly awakens.</span>")
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood
@@ -693,7 +695,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/squish(atom/squishee)
..()
var/teleport_radius = potency/10
var/teleport_radius = potency / 10
if(isliving(squishee))
new /obj/effect/decal/cleanable/molten_item(squishee.loc) //Leave a pile of goo behind for dramatic effect...
do_teleport(squishee, get_turf(squishee), teleport_radius)
@@ -901,7 +903,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
if(istype(src.loc,/mob))
pickup(src.loc)//adjusts the lighting on the mob
else
src.SetLuminosity(round(potency/10,1))
src.SetLuminosity(round(potency / 10,1))
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/add_juice()
if(..())
@@ -913,7 +915,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
if(istype(user.loc,/turf/space))
return
var/obj/effect/glowshroom/planted = new /obj/effect/glowshroom(user.loc)
planted.delay = planted.delay - production*100 //So the delay goes DOWN with better stats instead of up. :I
planted.delay = planted.delay - production * 100 //So the delay goes DOWN with better stats instead of up. :I
planted.endurance = endurance
planted.yield = yield
planted.potency = potency
@@ -922,16 +924,16 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Destroy()
if(istype(loc,/mob))
loc.AddLuminosity(round(-potency/10,1))
loc.AddLuminosity(round(-potency / 10,1))
..()
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user)
SetLuminosity(0)
user.AddLuminosity(round(potency/10,1))
user.AddLuminosity(round(potency / 10,1))
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/dropped(mob/user)
user.AddLuminosity(round(-potency/10,1))
SetLuminosity(round(potency/10,1))
user.AddLuminosity(round(-potency / 10,1))
SetLuminosity(round(potency / 10,1))
/obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit
@@ -945,9 +947,6 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 20), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit/attack_self(mob/user as mob)
switch(potency)
if(0 to 10)
inside_type = /obj/item/weapon/spacecash/