cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

last fixes, hopefully

Browse Source
This commit is contained in:
Fox-McCloud
2017-02-04 04:28:42 -05:00
parent ed4ae3dd8f
commit f8602ffef8
8 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown/chili.dm
-1
View File
@@ -71,7 +71,6 @@
name = "ghost chili"
desc = "It seems to be vibrating gently."
icon_state = "ghostchilipepper"
var/mob/held_mob
filling_color = "#F8F8FF"
bitesize_mod = 4
origin_tech = "biotech=4;magnets=5"
code/modules/hydroponics/hydroponics.dm
+6 -12
View File
@@ -23,7 +23,7 @@
var/harvest = 0 //Ready to harvest?
var/obj/item/seeds/myseed = null //The currently planted seed
var/rating = 1
var/unwrenchable = 1
var/wrenchable = 1
var/recent_bee_visit = FALSE //Have we been visited by a bee recently, so bees dont overpollinate one plant
var/using_irrigation = FALSE //If the tray is connected to other trays via irrigation hoses
var/self_sustaining = FALSE //If the tray generates nutrients and water on its own
@@ -83,13 +83,7 @@
if(exchange_parts(user, I))
return
if(istype(I, /obj/item/weapon/wrench))
if(using_irrigation)
to_chat(user, "<span class='warning'>Disconnect the hoses first!</span>")
else if(default_unfasten_wrench(user, I))
return
if(istype(I, /obj/item/weapon/crowbar))
if(iscrowbar(I))
if(using_irrigation)
to_chat(user, "<span class='warning'>Disconnect the hoses first!</span>")
else if(default_deconstruction_crowbar(I, 1))
@@ -839,7 +833,7 @@
return
S.handle_item_insertion(G, 1)
else if(istype(O, /obj/item/weapon/wrench) && unwrenchable)
else if(iswrench(O) && wrenchable)
if(using_irrigation)
to_chat(user, "<span class='warning'>Disconnect the hoses first!</span>")
return
@@ -864,7 +858,7 @@
user.visible_message("[user] unwrenches [src].", \
"<span class='notice'>You unwrench [src].</span>")
else if(istype(O, /obj/item/weapon/wirecutters) && unwrenchable)
else if(iswirecutter(O) && wrenchable)
using_irrigation = !using_irrigation
playsound(src, 'sound/items/Wirecutter.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] [using_irrigation ? "" : "dis"]connects [src]'s irrigation hoses.</span>", \
@@ -872,7 +866,7 @@
for(var/obj/machinery/hydroponics/h in range(1,src))
h.update_icon()
else if(istype(O, /obj/item/weapon/shovel/spade) && unwrenchable)
else if(istype(O, /obj/item/weapon/shovel/spade))
if(!myseed && !weedlevel)
to_chat(user, "<span class='warning'>[src] doesn't have any plants or weeds!</span>")
return
@@ -972,7 +966,7 @@
icon_state = "soil"
density = 0
use_power = 0
unwrenchable = 0
wrenchable = 0
/obj/machinery/hydroponics/soil/update_icon_hoses()
return // Has no hoses
code/modules/hydroponics/seeds.dm
+3 -3
View File
@@ -336,14 +336,14 @@
for(var/i in 1 to seed.growthstages)
if("[seed.icon_grow][i]" in states)
continue
to_chat(world, "[seed.name] ([seed.type]) lacks the [seed.icon_grow][i] icon!")
log_runtime("[seed.name] ([seed.type]) lacks the [seed.icon_grow][i] icon!", src)
if(!(seed.icon_dead in states))
to_chat(world, "[seed.name] ([seed.type]) lacks the [seed.icon_dead] icon!")
log_runtime("[seed.name] ([seed.type]) lacks the [seed.icon_dead] icon!", src)
if(seed.icon_harvest) // mushrooms have no grown sprites, same for items with no product
if(!(seed.icon_harvest in states))
to_chat(world, "[seed.name] ([seed.type]) lacks the [seed.icon_harvest] icon!")
log_runtime("[seed.name] ([seed.type]) lacks the [seed.icon_harvest] icon!", src)
/obj/item/seeds/proc/randomize_stats()
set_lifespan(rand(25, 60))