mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
goodbye replicapod, hello dionanode
This commit is contained in:
@@ -1233,8 +1233,8 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality"
|
||||
|
||||
/datum/supply_packs/exoticseeds
|
||||
name = "Exotic seeds crate"
|
||||
contains = list(/obj/item/seeds/replicapod,
|
||||
/obj/item/seeds/replicapod,
|
||||
contains = list(/obj/item/seeds/dionanode,
|
||||
/obj/item/seeds/dionanode,
|
||||
/obj/item/seeds/libertymycelium,
|
||||
/obj/item/seeds/reishimycelium,
|
||||
/obj/item/seeds/random,
|
||||
|
||||
@@ -722,8 +722,8 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
|
||||
user.client.screen -= O
|
||||
O.dropped(user)
|
||||
updateicon()
|
||||
if(istype(0, /obj/item/seeds/replicapod))
|
||||
var/obj/item/seeds/replicapod/RP = O
|
||||
if(istype(0, /obj/item/seeds/dionanode))
|
||||
var/obj/item/seeds/dionanode/RP = O
|
||||
if(!RP.source)
|
||||
RP.request_player()
|
||||
else
|
||||
@@ -983,7 +983,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
|
||||
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/obj/machinery/hydroponics/proc/update_tray() called tick#: [world.time]")
|
||||
harvest = 0
|
||||
lastproduce = age
|
||||
if((yieldmod * myseed.yield) <= 0 || istype(myseed,/obj/item/seeds/replicapod))
|
||||
if((yieldmod * myseed.yield) <= 0 || istype(myseed,/obj/item/seeds/dionanode))
|
||||
user << text("<span class='warning'>You fail to harvest anything useful.</span>")
|
||||
else
|
||||
user << text("You harvest from the [myseed.plantname].")
|
||||
|
||||
@@ -1438,7 +1438,7 @@
|
||||
/obj/item/seeds/cornseed = 3,
|
||||
/obj/item/seeds/eggplantseed = 3,
|
||||
/obj/item/seeds/potatoseed = 3,
|
||||
/obj/item/seeds/replicapod = 3,
|
||||
/obj/item/seeds/dionanode = 3,
|
||||
/obj/item/seeds/soyaseed = 3,
|
||||
/obj/item/seeds/sunflowerseed = 3,
|
||||
/obj/item/seeds/tomatoseed = 3,
|
||||
|
||||
@@ -487,12 +487,12 @@
|
||||
if(!isnull(seed))
|
||||
|
||||
if(draw_warnings && health <= (seed.endurance / 2))
|
||||
overlays += "over_lowhealth3"
|
||||
overlays += icon(seed.plant_dmi,"over_lowhealth3")
|
||||
|
||||
if(dead)
|
||||
overlays += "[seed.plant_icon]-dead"
|
||||
overlays += icon(seed.plant_dmi,"[seed.plant_icon]-dead")
|
||||
else if(harvest)
|
||||
overlays += "[seed.plant_icon]-harvest"
|
||||
overlays += icon(seed.plant_dmi,"[seed.plant_icon]-harvest")
|
||||
else if(age < seed.maturation)
|
||||
|
||||
var/t_growthstate
|
||||
@@ -501,10 +501,10 @@
|
||||
else
|
||||
t_growthstate = round(seed.maturation / seed.growth_stages)
|
||||
|
||||
overlays += "[seed.plant_icon]-grow[t_growthstate]"
|
||||
overlays += icon(seed.plant_dmi,"[seed.plant_icon]-grow[t_growthstate]")
|
||||
lastproduce = age
|
||||
else
|
||||
overlays += "[seed.plant_icon]-grow[seed.growth_stages]"
|
||||
overlays += icon(seed.plant_dmi,"[seed.plant_icon]-grow[seed.growth_stages]")
|
||||
|
||||
//Draw the cover.
|
||||
if(closed_system)
|
||||
|
||||
@@ -106,6 +106,7 @@ proc/populate_seed_list()
|
||||
var/alter_temp // If set, the plant will periodically alter local temp by this amount.
|
||||
|
||||
// Cosmetics.
|
||||
var/plant_dmi = 'icons/obj/hydroponics.dmi'// DMI to use for the plant growing in the tray.
|
||||
var/plant_icon // Icon to use for the plant growing in the tray.
|
||||
var/product_icon // Base to use for fruit coming from this plant (if a vine).
|
||||
var/product_colour // Colour to apply to product base (if a vine).
|
||||
@@ -116,6 +117,8 @@ proc/populate_seed_list()
|
||||
var/flower_icon = "vine_fruit" // Which overlay to use.
|
||||
var/flower_colour // Which colour to use.
|
||||
|
||||
var/mob_drop // Seed type dropped by the mobs when it dies without an host
|
||||
|
||||
//Creates a random seed. MAKE SURE THE LINE HAS DIVERGED BEFORE THIS IS CALLED.
|
||||
/datum/seed/proc/randomize()
|
||||
|
||||
@@ -188,7 +191,7 @@ proc/populate_seed_list()
|
||||
list("seed-cocoapod", "cocoapod"),
|
||||
list("seed-cherry", "cherry"),
|
||||
list("seed-kudzu", "kudzu"),
|
||||
list("seed-replicapod", "replicapod")
|
||||
list("seed-dionanode", "dionanode")
|
||||
))
|
||||
|
||||
packet_icon = plant_icons[1]
|
||||
@@ -1623,10 +1626,12 @@ proc/populate_seed_list()
|
||||
name = "diona"
|
||||
seed_name = "diona"
|
||||
seed_noun = "nodes"
|
||||
display_name = "replicant pods"
|
||||
packet_icon = "seed-replicapod"
|
||||
display_name = "diona nodes"
|
||||
packet_icon = "seed-dionanode"
|
||||
products = list(/mob/living/carbon/monkey/diona)
|
||||
plant_icon = "replicapod"
|
||||
plant_dmi = 'icons/obj/hydroponics2.dmi'
|
||||
plant_icon = "dionanode"
|
||||
mob_drop = /obj/item/seeds/dionanode
|
||||
product_requires_player = 1
|
||||
immutable = 1
|
||||
|
||||
|
||||
@@ -20,9 +20,12 @@
|
||||
host.stat = 2 // handle death() properly. Better safe than etc.
|
||||
host.visible_message("<span class='warning'><b>[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.</span>")
|
||||
|
||||
var/obj/item/seeds/S = new(get_turf(host))
|
||||
S.seed_type = name
|
||||
S.update_seed()
|
||||
if(mob_drop)
|
||||
new mob_drop(get_turf(host))
|
||||
else
|
||||
var/obj/item/seeds/S = new(get_turf(host))
|
||||
S.seed_type = name
|
||||
S.update_seed()
|
||||
|
||||
//poll="Someone is harvesting [display_name]. Would you like to play as one?"
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
|
||||
//the vegetable/fruit categories are made from a culinary standpoint. many of the "vegetables" in there are technically fruits. (tomatoes, pumpkins...)
|
||||
|
||||
/obj/item/seeds/replicapod
|
||||
/obj/item/seeds/dionanode
|
||||
seed_type = "diona"
|
||||
vending_cat = "sentient"
|
||||
|
||||
|
||||
@@ -912,7 +912,7 @@
|
||||
/obj/item/seeds/potatoseed,
|
||||
/obj/item/seeds/pumpkinseed,
|
||||
/obj/item/seeds/reishimycelium,
|
||||
/obj/item/seeds/replicapod,
|
||||
/obj/item/seeds/dionanode,
|
||||
/obj/item/seeds/riceseed,
|
||||
/obj/item/seeds/soyaseed,
|
||||
/obj/item/seeds/sugarcaneseed,
|
||||
|
||||
BIN
icons/obj/hydroponics2.dmi
Normal file
BIN
icons/obj/hydroponics2.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Reference in New Issue
Block a user