cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce lines by removing blank lines added by PJ's script

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 08:25:57 -07:00
parent 9d430844c3
commit 78f53553f8
1049 changed files with 3 additions and 8630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown.dm
-31
View File
@@ -29,7 +29,6 @@
sleep(250) // ugly hack, should mean roundstart plants are fine.
if(!plant_controller)
to_chat(world, "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
qdel(src)
return
@@ -85,7 +84,6 @@
sleep(250) // ugly hack, should mean roundstart plants are fine.
if(!plant_controller)
to_chat(world, "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
qdel(src)
return
@@ -185,7 +183,6 @@
M.stop_pulling()
to_chat(M, "<span class='notice'>You slipped on the [name]!</span>")
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
M.Stun(8)
M.Weaken(5)
@@ -206,7 +203,6 @@
if(C.use(5))
//TODO: generalize this.
to_chat(user, "<span class='notice'>You add some cable to the [src.name] and slide it inside the battery casing.</span>")
var/obj/item/weapon/stock_parts/cell/potato/pocell = new /obj/item/weapon/stock_parts/cell/potato(get_turf(user))
if(src.loc == user && !(user.l_hand && user.r_hand) && istype(user,/mob/living/carbon/human))
user.put_in_hands(pocell)
@@ -224,7 +220,6 @@
return
else if(seed.kitchen_tag == "potato")
to_chat(user, "You slice \the [src] into sticks.")
reagents_per_slice = reagents.total_volume
slice = new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src))
reagents.trans_to(slice, reagents_per_slice)
@@ -232,7 +227,6 @@
return
else if(seed.kitchen_tag == "carrot")
to_chat(user, "You slice \the [src] into sticks.")
reagents_per_slice = reagents.total_volume
slice = new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
reagents.trans_to(slice, reagents_per_slice)
@@ -240,7 +234,6 @@
return
else if(seed.kitchen_tag == "watermelon")
to_chat(user, "You slice \the [src] into large slices.")
reagents_per_slice = reagents.total_volume/5
for(var/i=0,i<5,i++)
slice = new /obj/item/weapon/reagent_containers/food/snacks/watermelonslice(get_turf(src))
@@ -249,7 +242,6 @@
return
else if(seed.kitchen_tag == "soybeans")
to_chat(user, "You roughly chop up \the [src].")
reagents_per_slice = reagents.total_volume
slice = new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
reagents.trans_to(slice, reagents_per_slice)
@@ -268,7 +260,6 @@
continue
G.attackby(NG, user)
to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.amount] planks.")
qdel(src)
return
else if(istype(W, /obj/item/weapon/rollingpaper))
@@ -293,12 +284,10 @@
qdel(W)
user.put_in_active_hand(J)
to_chat(user, "\blue You roll the [src] into a rolling paper.")
qdel(src)
else
to_chat(user, "\red You can't roll a smokable from the [src].")
..()
/obj/item/weapon/reagent_containers/food/snacks/grown/attack(var/mob/living/carbon/M, var/mob/user, var/def_zone)
@@ -359,13 +348,11 @@
if(reagents && reagents.total_volume <= 0) //used-up fruit will be destroyed
if(user)
to_chat(user, "<span class='danger'>\The [src] has dried out and crumbles to dust.</span>")
//user.drop_from_inventory(src)
qdel(src)
else if(prob(35)) //fruit that still has reagents has a chance of breaking each time it stings on hit
if(user)
to_chat(user, "<span class='danger'>\The [src] has fallen to bits.</span>")
//user.drop_from_inventory(src)
qdel(src)
@@ -392,7 +379,6 @@
if(user.a_intent == I_DISARM && seed.get_trait(TRAIT_SPREAD) > 0) //Using disarm so we can tell if you want to plant or convert non-final plants
to_chat(user, "<span class='notice'>You plant the [src.name].</span>")
new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed)
new /obj/effect/plant(get_turf(user), src.seed)
qdel(src)
@@ -405,14 +391,12 @@
var/obj/item/stack/medical/bruise_pack/comfrey/poultice = new /obj/item/stack/medical/bruise_pack/comfrey(user.loc)
poultice.heal_brute = potency
to_chat(user, "<span class='notice'>You mash the leaves into a poultice.</span>")
qdel(src)
return
if("aloe")
var/obj/item/stack/medical/ointment/aloe/poultice = new /obj/item/stack/medical/ointment/aloe(user.loc)
poultice.heal_burn = potency
to_chat(user, "<span class='notice'>You mash the petals into a poultice.</span>")
qdel(src)
return
if("grass")
@@ -427,7 +411,6 @@
continue
NG.attackby(G, user)
to_chat(user, "You add the newly-formed grass to the stack. It now contains [G.amount] tiles.")
qdel(src)
return
if("sunflower")
@@ -442,7 +425,6 @@
user.say("PRAISE THE SUN!")
else
to_chat(user, "PRAISE THE SUN!")
user.unEquip(src)
user.put_in_hands(NF)
qdel(src)
@@ -451,7 +433,6 @@
var/obj/item/weapon/grown/nettle/nettle = new /obj/item/weapon/grown/nettle(user.loc)
nettle.force = round((5 + potency / 5), 1)
to_chat(user, "You straighten up the plant.")
user.unEquip(src)
user.put_in_hands(nettle)
qdel(src)
@@ -460,51 +441,40 @@
var/obj/item/weapon/grown/nettle/death/DN = new /obj/item/weapon/grown/nettle/death(user.loc)
DN.force = round((5 + potency / 2.5), 1)
to_chat(user, "You straighten up the plant.")
user.unEquip(src)
user.put_in_hands(DN)
qdel(src)
return
if("cashpod")
to_chat(user, "You crack open the cash pod...")
var/value = round(seed.get_trait(TRAIT_POTENCY))
user.unEquip(src)
switch(value)
if(0)
to_chat(user, "It's empty! What a waste...")
if(1 to 10)
to_chat(user, "It has a space dollar inside. Woo.")
new /obj/item/weapon/spacecash(get_turf(user))
if(11 to 20)
to_chat(user, "It has 10 space dollars inside!")
new /obj/item/weapon/spacecash/c10(get_turf(user))
if(21 to 30)
to_chat(user, "It has 20 space dollars inside! Cool!")
new /obj/item/weapon/spacecash/c20(get_turf(user))
if(31 to 40)
to_chat(user, "It has 50 space dollars inside! Nice!")
new /obj/item/weapon/spacecash/c50(get_turf(user))
if(41 to 50)
to_chat(user, "It has 100 space dollars inside! Sweet!")
new /obj/item/weapon/spacecash/c100(get_turf(user))
if(51 to 60)
to_chat(user, "It has 200 space dollars inside! Awesome!")
new /obj/item/weapon/spacecash/c200(get_turf(user))
if(61 to 80)
to_chat(user, "It has 500 space dollars inside! CHA-CHING!")
new /obj/item/weapon/spacecash/c500(get_turf(user))
else
to_chat(user, "It has 1000 space dollars inside! JACKPOT!")
new /obj/item/weapon/spacecash/c1000(get_turf(user))
qdel(src)
return
@@ -538,5 +508,4 @@
batteries_recharged = 1
if(batteries_recharged)
to_chat(usr, "<span class='notice'>Battery has recovered.</span>")
..()
code/modules/hydroponics/grown_inedible.dm
-11
View File
@@ -66,7 +66,6 @@
else
C.take_organ_damage(0,force)
to_chat(C, "<span class='userdanger'>The nettle burns your bare hand!</span>")
return 1
/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
@@ -75,7 +74,6 @@
force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off
else
to_chat(usr, "All the leaves have fallen off the nettle from violent whacking.")
usr.unEquip(src)
qdel(src)
@@ -94,11 +92,9 @@
user.Paralyse(5)
to_chat(user, "<span class='userdanger'>You are stunned by the Deathnettle when you try picking it up!</span>")
/obj/item/weapon/grown/nettle/death/afterattack(mob/living/carbon/M, mob/user)
if(istype(M, /mob/living))
to_chat(M, "<span class='danger'>You are stunned by the powerful acid of the Deathnettle!</span>")
add_logs(M, user, "attacked", src)
M.eye_blurry += force/7
@@ -123,7 +119,6 @@
..()
if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/knife))
to_chat(user, "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>")
new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
qdel(src)
return
@@ -155,11 +150,9 @@
/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob)
to_chat(M, "<font color='green'><b> [user] smacks you with a [name]!</font><font color='yellow'><b>FLOWER POWER<b></font>")
to_chat(user, "<font color='green'> Your [name]'s </font><font color='yellow'><b>FLOWER POWER</b></font><font color='green'> strikes [M]</font>")
// Novaflower
/obj/item/weapon/grown/novaflower
@@ -175,16 +168,12 @@
/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob)
to_chat(M, "<font color='green'>[user] smacks you with a [name]!</font><font color='yellow'><b>FLOWER POWER</b></font>")
to_chat(user, "<font color='green'> Your [name]'s </font><font color='yellow'><b>FLOWER POWER</b></font><font color='green'> strikes [M]</font>")
if(istype(M, /mob/living))
to_chat(M, "<span class='warning'>You are heated by the warmth of the of the [name]!</span>")
M.bodytemperature += potency/2 * TEMPERATURE_DAMAGE_COEFFICIENT
/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob)
if(!user.gloves)
to_chat(user, "<span class='warning'>The [name] burns your bare hand!</span>")
user.adjustFireLoss(rand(1,5))
code/modules/hydroponics/seed.dm
-7
View File
@@ -121,18 +121,14 @@
if(get_trait(TRAIT_CARNIVOROUS) == 2)
if(affecting)
to_chat(target, "<span class='danger'>\The [fruit]'s thorns pierce your [affecting.name] greedily!</span>")
else
to_chat(target, "<span class='danger'>\The [fruit]'s thorns pierce your flesh greedily!</span>")
damage = get_trait(TRAIT_POTENCY)/2
else
if(affecting)
to_chat(target, "<span class='danger'>\The [fruit]'s thorns dig deeply into your [affecting.name]!</span>")
else
to_chat(target, "<span class='danger'>\The [fruit]'s thorns dig deeply into your flesh!</span>")
damage = get_trait(TRAIT_POTENCY)/5
else
return
@@ -192,7 +188,6 @@
return
to_chat(target, "<span class='danger'>You are stung by \the [fruit]!</span>")
for(var/rid in chems)
var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5))
target.reagents.add_reagent(rid,injecting)
@@ -720,12 +715,10 @@
if(!force_amount && get_trait(TRAIT_YIELD) == 0 && !harvest_sample)
if(istype(user))
to_chat(user, "<span class='danger'>You fail to harvest anything useful.</span>")
else
if(istype(user))
to_chat(user, "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name].")
//This may be a new line. Update the global if it is.
if(name == "new line" || !(name in plant_controller.seeds))
uid = plant_controller.seeds.len + 1
code/modules/hydroponics/seed_controller.dm
-4
View File
@@ -14,13 +14,11 @@
if(!plant_controller || !plant_controller.gene_tag_list)
to_chat(usr, "Gene tags not set.")
return
for(var/gene_tag in plant_controller.gene_tag_list)
to_chat(usr, "[gene_tag]")
var/global/datum/controller/plants/plant_controller // Set in New().
/datum/controller/plants
@@ -148,7 +146,5 @@ var/global/datum/controller/plants/plant_controller // Set in New().
if(!plant_controller || !plant_controller.plant_sprites || !plant_controller.plant_sprites.len)
to_chat(world, "Cannot list plant sprites, plant controller or plant sprites list may not be initialized.")
for(var/base in plant_controller.plant_sprites)
to_chat(world, "[base] : [plant_controller.plant_sprites[base]] growth states")
code/modules/hydroponics/seed_machines.dm
-9
View File
@@ -18,7 +18,6 @@
var/choice = alert(user, "Are you sure you want to wipe the disk?", "Xenobotany Data", "No", "Yes")
if(src && user && genes && choice && choice == "Yes" && user.Adjacent(get_turf(src)))
to_chat(user, "You wipe the disk data.")
name = initial(name)
desc = initial(name)
genes = list()
@@ -84,24 +83,20 @@
if(istype(W,/obj/item/seeds))
if(seed)
to_chat(user, "There is already a seed loaded.")
return
var/obj/item/seeds/S =W
if(S.seed && S.seed.get_trait(TRAIT_IMMUTABLE) > 0)
to_chat(user, "That seed is not compatible with our genetics technology.")
else
user.drop_item(W)
W.loc = src
seed = W
to_chat(user, "You load [W] into [src].")
return
if(istype(W,/obj/item/weapon/screwdriver))
open = !open
to_chat(user, "<span class='notice'>You [open ? "open" : "close"] the maintenance panel.</span>")
return
if(open)
@@ -112,7 +107,6 @@
if(istype(W,/obj/item/weapon/disk/botany))
if(loaded_disk)
to_chat(user, "There is already a data disk loaded.")
return
else
var/obj/item/weapon/disk/botany/B = W
@@ -120,12 +114,10 @@
if(B.genes && B.genes.len)
if(!disk_needs_genes)
to_chat(user, "That disk already has gene data loaded.")
return
else
if(disk_needs_genes)
to_chat(user, "That disk does not have any gene data loaded.")
return
user.drop_item(W)
@@ -133,7 +125,6 @@
loaded_disk = W
to_chat(user, "You load [W] into [src].")
return
..()
code/modules/hydroponics/seed_packets.dm
-1
View File
@@ -64,7 +64,6 @@ var/global/list/plant_seed_sprites = list()
if(seed && !seed.roundstart)
to_chat(user, "It's tagged as variety #[seed.uid].")
/obj/item/seeds/cutting
name = "cuttings"
desc = "Some plant cuttings."
code/modules/hydroponics/seed_storage.dm
-2
View File
@@ -216,14 +216,12 @@
user.visible_message("[user] puts the seeds from \the [O.name] into \the [src].", "You put the seeds from \the [O.name] into \the [src].")
else
to_chat(user, "<span class='notice'>There are no seeds in \the [O.name].</span>")
return
else if(istype(O, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
anchored = !anchored
to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].")
/obj/machinery/seed_storage/proc/add(var/obj/item/seeds/O as obj)
if (istype(O.loc, /mob))
var/mob/user = O.loc
code/modules/hydroponics/spreading/spreading.dm
-2
View File
@@ -93,7 +93,6 @@
sleep(250) // ugly hack, should mean roundstart plants are fine.
if(!plant_controller)
to_chat(world, "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
qdel(src)
return
@@ -245,7 +244,6 @@
if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel))
if(!seed)
to_chat(user, "There is nothing to take a sample from.")
return
seed.harvest(user,0,1)
health -= (rand(3,5)*10)
code/modules/hydroponics/spreading/spreading_response.dm
-1
View File
@@ -53,6 +53,5 @@
//entangling people
if(victim.loc == src.loc)
to_chat(victim, "<span class='danger'>Tendrils [pick("wind", "tangle", "tighten")] around you!</span>")
can_buckle = 1
buckle_mob(victim)
code/modules/hydroponics/trays/tray.dm
-40
View File
@@ -165,7 +165,6 @@
if(closed_system)
if(user)
to_chat(user, "You can't harvest from the plant while the lid is shut.")
return
if(user)
@@ -199,7 +198,6 @@
if(closed_system)
to_chat(user, "You can't remove the dead plant while the lid is shut.")
return
seed = null
@@ -212,7 +210,6 @@
mutation_mod = 0
to_chat(user, "You remove the dead plant.")
check_health()
return
@@ -341,12 +338,10 @@
if(labelled)
to_chat(usr, "You remove the label.")
labelled = null
update_icon()
else
to_chat(usr, "There is no label to remove.")
return
/obj/machinery/portable_atmospherics/hydroponics/verb/setlight()
@@ -359,7 +354,6 @@
tray_light = new_light
to_chat(usr, "You set the tray to a light level of [tray_light] lumens.")
/obj/machinery/portable_atmospherics/hydroponics/proc/check_level_sanity()
//Make sure various values are sane.
if(seed)
@@ -406,7 +400,6 @@
if(istype(O, /obj/item/weapon/crowbar))
if(anchored==2)
to_chat(user, "Unscrew the hoses first!")
return
default_deconstruction_crowbar(O, 1)
@@ -419,13 +412,11 @@
//Check if container is empty
if(!C.reagents.total_volume)
to_chat(user, "\red [C] is empty.")
return
//Container not empty, transfer contents to tray
var/trans = C.reagents.trans_to(src, C.amount_per_transfer_from_this)
to_chat(user, "\blue You transfer [trans] units of the solution to [src].")
check_level_sanity()
process_reagents()
update_icon()
@@ -438,7 +429,6 @@
pestlevel -= P.pest_kill_str
weedlevel -= P.weed_kill_str
to_chat(user, "You spray [src] with [O].")
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
qdel(O)
@@ -452,7 +442,6 @@
toxins += W.toxicity
weedlevel -= W.weed_kill_str
to_chat(user, "You spray [src] with [O].")
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
qdel(O)
@@ -466,7 +455,6 @@
if(seed)
if(!S.reagents.total_volume)
to_chat(user, "\red [S] is empty.")
return
//Container not empty, transfer contents to tray
S.reagents.trans_to(src, S.amount_per_transfer_from_this)
@@ -477,21 +465,18 @@
else
to_chat(user, "There's nothing in [src] to spray!")
else if(istype(O, /obj/item/weapon/screwdriver) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY
if(anchored)
if(anchored == 2)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 1
to_chat(user, "You unscrew the [src]'s hoses.")
panel_open = 0
else if(anchored == 1)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 2
to_chat(user, "You screw in the [src]'s hoses.")
panel_open = 1
for(var/obj/machinery/portable_atmospherics/hydroponics/h in range(1,src))
@@ -502,17 +487,14 @@
if(!seed)
to_chat(user, "There is nothing to take a sample from in \the [src].")
return
if(sampled)
to_chat(user, "You have already sampled from this plant.")
return
if(dead)
to_chat(user, "The plant is dead.")
return
// Create a sample.
@@ -538,16 +520,13 @@
return ..()
else
to_chat(user, "There's no plant to inject.")
return 1
else
if(seed)
//Leaving this in in case we want to extract from plants later.
to_chat(user, "You can't get any extract out of this plant.")
else
to_chat(user, "There's nothing to draw something from.")
return 1
else if (istype(O, /obj/item/seeds))
@@ -559,12 +538,10 @@
if(!S.seed)
to_chat(user, "The packet seems to be empty. You throw it away.")
qdel(O)
return
to_chat(user, "You plant the [S.seed.seed_name] [S.seed.seed_noun].")
seed = S.seed //Grab the seed datum.
dead = 0
age = 1
@@ -580,7 +557,6 @@
else
to_chat(user, "<span class='danger'>\The [src] already has seeds in it!</span>")
else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe
if(weedlevel > 0)
@@ -590,7 +566,6 @@
else
to_chat(user, "<span class='danger'>This plot is completely devoid of weeds. It doesn't need uprooting.</span>")
else if (istype(O, /obj/item/weapon/storage/bag/plants))
attack_hand(user)
@@ -611,12 +586,10 @@
anchored = !anchored
to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].")
else if(istype(O, /obj/item/apiary))
if(seed)
to_chat(user, "<span class='danger'>[src] is already occupied!</span>")
else
user.drop_item()
qdel(O)
@@ -629,7 +602,6 @@
else if ((istype(O, /obj/item/weapon/tank) && !( src.destroyed )))
if (src.holding)
to_chat(user, "\blue There is alreadu a tank loaded into the [src].")
return
var/obj/item/weapon/tank/T = O
user.drop_item()
@@ -665,34 +637,26 @@
if(!seed)
to_chat(user, "[src] is empty.")
return
to_chat(user, "<span class='notice'>[seed.display_name]</span> are growing here.</span>")
if(!Adjacent(user))
return
to_chat(user, "Water: [round(waterlevel,0.1)]/[maxwater]")
to_chat(user, "Nutrient: [round(nutrilevel,0.1)]/[maxnutri]")
if(weedlevel >= 5)
to_chat(user, "\The [src] is <span class='danger'>infested with weeds</span>!")
if(pestlevel >= 5)
to_chat(user, "\The [src] is <span class='danger'>infested with tiny worms</span>!")
if(dead)
to_chat(user, "<span class='danger'>The plant is dead.</span>")
else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2))
to_chat(user, "The plant looks <span class='danger'>unhealthy</span>.")
if(mechanical)
var/turf/T = loc
var/datum/gas_mixture/environment
@@ -721,7 +685,6 @@
to_chat(user, "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K.")
/obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb()
set name = "Toggle Tray Lid"
set category = "Object"
@@ -734,7 +697,6 @@
closed_system = !closed_system
to_chat(user, "You [closed_system ? "close" : "open"] the tray's lid.")
update_icon()
/obj/machinery/portable_atmospherics/hydroponics/verb/eject_tank_verb()
@@ -750,9 +712,7 @@
if(!holding)
to_chat(usr, "\red There is no tank loaded into [src] to eject.")
if(istype(holding, /obj/item/weapon/tank))
to_chat(usr, "\blue You eject [holding.name] from [src].")
holding.loc = loc
holding = null
code/modules/hydroponics/trays/tray_apiary.dm
-16
View File
@@ -36,11 +36,9 @@
if(!yieldmod)
yieldmod += 1
// to_chat(world, "Yield increased by 1, from 0, to a total of [myseed.yield]")
else if (prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2...
yieldmod += 1
// to_chat(world, "Yield increased by 1, to a total of [myseed.yield]")
else
..()
return
@@ -49,14 +47,12 @@
if(istype(O, /obj/item/queen_bee))
if(health > 0)
to_chat(user, "\red There is already a queen in there.")
else
health = 10
nutrilevel += 10
user.drop_item()
qdel(O)
to_chat(user, "\blue You carefully insert the queen into [src], she gets busy making a hive.")
bees_in_hive = 0
else if(istype(O, /obj/item/beezeez))
beezeez += 100
@@ -64,53 +60,42 @@
user.drop_item()
if(health > 0)
to_chat(user, "\blue You insert [O] into [src]. A relaxed humming appears to pick up.")
else
to_chat(user, "\blue You insert [O] into [src]. Now it just needs some bees.")
qdel(O)
else if(istype(O, /obj/item/weapon/minihoe))
if(health > 0)
to_chat(user, "\red <b>You begin to dislodge the apiary from the tray, the bees don't like that.</b>")
angry_swarm(user)
else
to_chat(user, "\blue You begin to dislodge the dead apiary from the tray.")
if(do_after(user, 50, target = src))
new hydrotray_type(src.loc)
new /obj/item/apiary(src.loc)
to_chat(user, "\red You dislodge the apiary from the tray.")
qdel(src)
else if(istype(O, /obj/item/weapon/bee_net))
var/obj/item/weapon/bee_net/N = O
if(N.caught_bees > 0)
to_chat(user, "\blue You empty the bees into the apiary.")
bees_in_hive += N.caught_bees
N.caught_bees = 0
else
to_chat(user, "\blue There are no more bees in the net.")
else if(istype(O, /obj/item/weapon/reagent_containers/glass))
var/obj/item/weapon/reagent_containers/glass/G = O
if(harvestable_honey > 0)
if(health > 0)
to_chat(user, "\red You begin to harvest the honey. The bees don't seem to like it.")
angry_swarm(user)
else
to_chat(user, "\blue You begin to harvest the honey.")
if(do_after(user,50, target = src))
G.reagents.add_reagent("honey",harvestable_honey)
harvestable_honey = 0
to_chat(user, "\blue You successfully harvest the honey.")
else
to_chat(user, "\blue There is no honey left to harvest.")
else
angry_swarm(user)
..()
@@ -252,5 +237,4 @@
H.reagents.add_reagent("toxin", toxic)
to_chat(usr, "\blue You harvest the honeycomb from the hive. There is a wild buzzing!")
angry_swarm(usr)
code/modules/hydroponics/trays/tray_tools.dm
-4
View File
@@ -30,7 +30,6 @@
/obj/item/device/analyzer/plant_analyzer/proc/print_report(var/mob/living/user)
if(!last_data)
to_chat(user, "There is no scan data to print.")
return
playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1)
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src))
@@ -101,7 +100,6 @@
if(!grown_seed)
to_chat(user, "<span class='danger'>[src] can tell you nothing about \the [target].</span>")
return
form_title = "[grown_seed.seed_name] (#[grown_seed.uid])"
@@ -347,7 +345,6 @@
extend = !extend
if(extend)
to_chat(user, "<span class ='warning'>With a flick of the wrist, you extend the scythe. It's reaping time!</span>")
icon_state = "tscythe1"
item_state = "scythe0"
slot_flags &= ~SLOT_BELT
@@ -359,7 +356,6 @@
playsound(src.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1) //Sound credit to Qat of Freesound.org
else
to_chat(user, "<span class ='notice'>You collapse the scythe, folding it for easy storage.</span>")
icon_state = "tscythe0"
item_state = "tscythe0" //no sprite in other words
slot_flags |= SLOT_BELT
code/modules/hydroponics/trays/tray_update_icons.dm
-1
View File
@@ -31,7 +31,6 @@
seed.update_growth_stages()
if(!seed.growth_stages)
to_chat(world, "<span class='danger'>Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.</span>")
return
var/overlay_stage = 1
if(age >= seed.get_trait(TRAIT_MATURATION))