cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-28 11:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds some forgotten plants for Sif flora, fixes a misnamed plant type.

Browse Source
This commit is contained in:
MistakeNot4892
2021-10-13 20:26:00 +11:00
parent 97b88bfc7b
commit 9d4fd65628
6 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/structures/flora/flora.dm
View File

@@ -511,7 +511,7 @@
max_harvests = 3
min_harvests = 0
harvest_loot = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/sif/wabback = 15,
/obj/item/weapon/reagent_containers/food/snacks/grown/sif/whitewabback = 15,
/obj/item/weapon/reagent_containers/food/snacks/grown/sif/blackwabback = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/sif/wildwabback = 30
)

2
code/game/turfs/simulated/outdoors/outdoors.dm
View File

@@ -48,7 +48,7 @@ var/list/turf_edge_cache = list()
if(do_after(user, delay, src))
if(!(locate(/obj/machinery/portable_atmospherics/hydroponics/soil) in contents))
var/obj/machinery/portable_atmospherics/hydroponics/soil/soil = new(src)
user.visible_message(SPAN_NOTICE("\The [src] digs \a [soil] into \the [src]."))
user.visible_message(SPAN_NOTICE("\The [user] digs \a [soil] into \the [src]."))
else
var/loot_type = get_loot_type()
if(loot_type)

4
code/modules/hydroponics/grown_sif.dm
View File

@@ -23,8 +23,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/sif/sifpod
plantname = "sifbulb"
/obj/item/weapon/reagent_containers/food/snacks/grown/sif/wabback
plantname = "wabback"
/obj/item/weapon/reagent_containers/food/snacks/grown/sif/whitewabback
plantname = "whitewabback"
/obj/item/weapon/reagent_containers/food/snacks/grown/sif/blackwabback
plantname = "blackwabback"

13
code/modules/hydroponics/seedtypes/flowers.dm
View File

@@ -53,6 +53,19 @@
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/flower/sunflower/cavebulbs
name = "cavebulbs"
seed_name = "cavebulbs"
display_name = "cavebulbs"
kitchen_tag = null
/datum/seed/flower/sunflower/cavebulbs/New()
..()
set_trait(TRAIT_BIOLUM,1)
set_trait(TRAIT_BIOLUM_COLOUR,"#ff9900")
set_trait(TRAIT_PRODUCT_COLOUR,"#c78a30")
set_trait(TRAIT_PLANT_COLOUR,"#82602e")
/datum/seed/flower/lavender
name = "lavender"
seed_name = "lavender"

15
code/modules/hydroponics/seedtypes/grapes.dm
View File

@@ -30,4 +30,17 @@
/datum/seed/grapes/green/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f")
set_trait(TRAIT_PRODUCT_COLOUR,"#42ed2f")
/datum/seed/grapes/eyebulbs
name = "eyebulbs"
seed_name = "eyebulb"
display_name = "eyebulbs"
mutants = null
chems = list("nutriment" = list(1,3), "imidazoline" = list(3,5))
/datum/seed/grapes/eyebulbs/New()
..()
set_trait(TRAIT_PLANT_COLOUR,"#471a73")
set_trait(TRAIT_PRODUCT_COLOUR,"#131217")

19
code/modules/hydroponics/trays/tray_soil.dm
View File

@@ -23,12 +23,19 @@
return 1
/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/weapon/shovel) && user.a_intent == I_HURT)
user.visible_message(SPAN_NOTICE("\The [user] begins filling in \the [src]."))
if(do_after(user, 3 SECONDS) && !QDELETED(src))
user.visible_message(SPAN_NOTICE("\The [user] fills in \the [src]."))
qdel(src)
return
if(istype(O, /obj/item/weapon/shovel))
if(user.a_intent == I_HURT)
user.visible_message(SPAN_NOTICE("\The [user] begins filling in \the [src]."))
if(do_after(user, 3 SECONDS) && !QDELETED(src))
user.visible_message(SPAN_NOTICE("\The [user] fills in \the [src]."))
qdel(src)
return TRUE
var/turf/T = get_turf(src)
if(istype(T))
return T.attackby(O, user)
. = ..()