cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into bay_examine

Browse Source 
# Conflicts:
#	code/game/objects/structures/displaycase.dm
This commit is contained in:
Tigercat2000
2015-09-15 14:08:36 -07:00
parent d0cd123ac0 41437df8ae
commit c562680098
208 changed files with 2587 additions and 3346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed_controller.dm
+7
View File
@@ -148,3 +148,10 @@ var/global/datum/controller/plants/plant_controller // Set in New().
/datum/controller/plants/proc/remove_plant(var/obj/effect/plant/plant)
plant_queue -= plant
/client/proc/list_plant_sprites()
if(!plant_controller || !plant_controller.plant_sprites || !plant_controller.plant_sprites.len)
world << "Cannot list plant sprites, plant controller or plant sprites list may not be initialized."
for(var/base in plant_controller.plant_sprites)
world << "[base] : [plant_controller.plant_sprites[base]] growth states"
code/modules/hydroponics/seed_datums.dm
+4 -3
View File
@@ -43,10 +43,11 @@
kitchen_tag = "ghostchili"
preset_icon = "ghostchilipepper"
/datum/seed/chili/ice/New()
/datum/seed/chili/ghost/New()
..()
set_trait(TRAIT_MATURATION,4)
set_trait(TRAIT_PRODUCTION,4)
set_trait(TRAIT_MATURATION,10)
set_trait(TRAIT_PRODUCTION,10)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_PRODUCT_COLOUR,"#00EDC6")
// Berry plants/variants.
code/modules/hydroponics/trays/tray.dm
+2
View File
@@ -133,6 +133,8 @@
)
//--FalseIncarnate
var/last_plant_ikey //This is for debugging reference, and is otherwise useless. --FalseIncarnate
/obj/machinery/portable_atmospherics/hydroponics/AltClick()
if(mechanical && !usr.stat && !usr.lying && Adjacent(usr))
close_lid(usr)
code/modules/hydroponics/trays/tray_update_icons.dm
+4 -1
View File
@@ -36,7 +36,9 @@
if(age >= seed.get_trait(TRAIT_MATURATION))
overlay_stage = seed.growth_stages
else
var/maturation = round(seed.get_trait(TRAIT_MATURATION)/seed.growth_stages)
var/maturation = seed.get_trait(TRAIT_MATURATION)/seed.growth_stages
if(maturation < 1)
maturation = 1
overlay_stage = maturation ? max(1,round(age/maturation)) : 1
var/ikey = "[seed.get_trait(TRAIT_PLANT_ICON)]-[overlay_stage]"
var/image/plant_overlay = plant_controller.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
@@ -45,6 +47,7 @@
plant_overlay.color = seed.get_trait(TRAIT_PLANT_COLOUR)
plant_controller.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"] = plant_overlay
overlays |= plant_overlay
last_plant_ikey = ikey
if(harvest && overlay_stage == seed.growth_stages)
ikey = "[seed.get_trait(TRAIT_PRODUCT_ICON)]"