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

Botany Rework

Browse Source
This commit is contained in:
Fox-McCloud
2017-01-21 18:28:03 -05:00
parent 96332e7c3d
commit ea76990b7a
127 changed files with 6356 additions and 7550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/gift_wrappaper.dm
+3 -3
View File
@@ -71,7 +71,7 @@
/obj/item/weapon/pen/invisible,
/obj/item/weapon/lipstick/random,
/obj/item/weapon/grenade/smokebomb,
/obj/item/weapon/corncob,
/obj/item/weapon/grown/corncob,
/obj/item/weapon/contraband/poster,
/obj/item/weapon/bikehorn,
/obj/item/weapon/beach_ball,
@@ -85,8 +85,8 @@
/obj/random/mech,
/obj/item/toy/spinningtoy,
/obj/item/toy/sword,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
/obj/item/device/paicard,
/obj/item/device/violin,
/obj/item/device/guitar,
code/game/objects/items/weapons/storage/bags.dm
+9 -29
View File
@@ -159,52 +159,32 @@
// -----------------------------
/obj/item/weapon/storage/bag/plants
icon = 'icons/obj/hydroponics.dmi'
name = "plant bag"
icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "plantbag"
name = "Plant Bag"
storage_slots = 50; //the number of plant pieces it can carry.
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
storage_slots = 100; //the number of plant pieces it can carry.
max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
max_w_class = 3
w_class = 1
can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown", "/obj/item/stack/tile/grass","/obj/item/stack/medical/ointment/aloe","/obj/item/stack/medical/bruise_pack/comfrey", "/obj/item/weapon/reagent_containers/honeycomb")
can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown","/obj/item/weapon/reagent_containers/food/snacks/ash_flora")
burn_state = FLAMMABLE
/obj/item/weapon/storage/bag/plants/portaseeder
name = "portable seed extractor"
desc = "For the enterprising botanist on the go. Less efficient than the stationary model, it creates one seed per plant."
icon_state = "portaseeder"
origin_tech = "biotech=3;engineering=2"
/obj/item/weapon/storage/bag/plants/portaseeder/verb/dissolve_contents()
set name = "Activate Seed Extraction"
set category = "Object"
set desc = "Activate to convert your plants into plantable seeds."
if(usr.stat || !usr.canmove || usr.restrained())
if(usr.incapacitated())
return
for(var/obj/item/O in contents)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown))
var/datum/seed/new_seed_type
if(istype(O, /obj/item/weapon/grown))
var/obj/item/weapon/grown/F = O
new_seed_type = plant_controller.seeds[F.plantname]
else
var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
new_seed_type = plant_controller.seeds[F.plantname]
if(new_seed_type)
var/obj/item/seeds/seeds = new(O.loc, O)
seeds.seed_type = new_seed_type.name
seeds.update_seed()
qdel(O)
if(istype(O, /obj/item/stack/tile/grass))
var/obj/item/stack/tile/grass/S = O
S.use(1)
new /obj/item/seeds/grassseed(O.loc, O)
for(var/mob/M in range(1))
if(M.s_active == src)
src.close(M)
close(M)
// -----------------------------
code/game/objects/items/weapons/storage/belt.dm
+2 -2
View File
@@ -139,8 +139,8 @@
item_state = "botany"
use_item_overlays = 1
can_hold = list(
"/obj/item/device/analyzer/plant_analyzer",
"/obj/item/weapon/minihoe",
"/obj/item/device/plant_analyzer",
"/obj/item/weapon/cultivator",
"/obj/item/weapon/hatchet",
"/obj/item/weapon/reagent_containers/glass/bottle",
"/obj/item/weapon/plantspray",