cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18154 from PKPenguin321/plant-analyzer-repath

Browse Source 
Repaths plant analyzers
This commit is contained in:
Jordie
2016-06-03 16:41:02 +10:00
parent 49f812fada 8e88d2d329
commit 4c8f8ae53e
15 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/DreamStation/dreamstation04.dmm
+2 -2
View File
@@ -27174,7 +27174,7 @@
/area/hallway/secondary/entry)
"bcf" = (
/obj/structure/table,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/obj/item/weapon/stock_parts/cell/high/plus,
/turf/open/floor/plating,
/area/storage/tech)
@@ -39032,7 +39032,7 @@
"byo" = (
/obj/machinery/hydroponics/soil,
/obj/item/seeds/coffee/robusta,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/turf/open/floor/plasteel{
icon_state = "floorgrime"
},
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
+2 -2
View File
@@ -441,7 +441,7 @@
name = "dust"
},
/obj/item/weapon/wirecutters,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/obj/item/weapon/reagent_containers/glass/bucket,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/plasteel/shuttle{
@@ -57796,7 +57796,7 @@
/area/security/prison)
"ccf" = (
/obj/structure/table,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/turf/open/floor/plasteel,
/area/security/prison)
"ccg" = (
_maps/map_files/MetaStation/MetaStation.dmm
+9 -9
View File
@@ -434,7 +434,7 @@
/area/security/prison)
"aaV" = (
/obj/machinery/hydroponics/constructable,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/obj/machinery/airalarm{
dir = 8;
icon_state = "alarm0";
@@ -23135,7 +23135,7 @@
/obj/machinery/light{
dir = 1
},
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/obj/item/weapon/reagent_containers/glass/bucket,
/turf/open/floor/plasteel{
icon_state = "warning"
@@ -27868,7 +27868,7 @@
/obj/item/weapon/cultivator,
/obj/item/weapon/crowbar,
/obj/item/weapon/reagent_containers/glass/bucket,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/turf/open/floor/plasteel{
dir = 1;
icon_state = "warning"
@@ -27912,7 +27912,7 @@
/obj/item/weapon/storage/bag/plants/portaseeder,
/obj/structure/table,
/obj/machinery/light,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/turf/open/floor/plasteel{
dir = 1;
icon_state = "warning"
@@ -35559,7 +35559,7 @@
/area/storage/tech)
"bfG" = (
/obj/structure/table,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -65262,7 +65262,7 @@
"cbE" = (
/obj/item/weapon/cultivator,
/obj/item/weapon/crowbar,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/obj/item/weapon/reagent_containers/glass/bucket,
/obj/structure/table/glass,
/turf/open/floor/plasteel{
@@ -91385,7 +91385,7 @@
"cPw" = (
/obj/item/weapon/storage/bag/plants/portaseeder,
/obj/item/weapon/storage/bag/plants/portaseeder,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/obj/item/weapon/cultivator,
/obj/item/weapon/reagent_containers/glass/bucket,
/obj/structure/rack{
@@ -91437,7 +91437,7 @@
/obj/machinery/hydroponics/soil{
pixel_y = 8
},
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/turf/open/floor/plating{
icon_state = "warnplate"
},
@@ -98728,7 +98728,7 @@
name = "dust"
},
/obj/item/weapon/wirecutters,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/obj/item/weapon/reagent_containers/glass/bucket,
/turf/open/floor/plasteel/shuttle{
icon_state = "shuttlefloor3"
code/game/machinery/vending.dm
+1 -1
View File
@@ -829,7 +829,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
icon_state = "nutri"
icon_deny = "nutri-deny"
products = list(/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez = 30,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z = 20,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh = 10,/obj/item/weapon/reagent_containers/spray/pestspray = 20,
/obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5,/obj/item/weapon/cultivator = 3,/obj/item/weapon/shovel/spade = 3,/obj/item/device/analyzer/plant_analyzer = 4)
/obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5,/obj/item/weapon/cultivator = 3,/obj/item/weapon/shovel/spade = 3,/obj/item/device/plant_analyzer = 4)
contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5)
/obj/machinery/vending/hydroseeds
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1 -1
View File
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/hydroponics/New()
..()
new /obj/item/weapon/storage/bag/plants/portaseeder(src)
new /obj/item/device/analyzer/plant_analyzer(src)
new /obj/item/device/plant_analyzer(src)
new /obj/item/device/radio/headset/headset_srv(src)
new /obj/item/weapon/cultivator(src)
new /obj/item/weapon/hatchet(src)
code/modules/cargo/packs.dm
+1 -1
View File
@@ -949,7 +949,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/ammonia,
/obj/item/weapon/hatchet,
/obj/item/weapon/cultivator,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/plant_analyzer,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/clothing/suit/apron)
crate_name = "hydroponics crate"
code/modules/clothing/suits/jobs.dm
+1 -1
View File
@@ -10,7 +10,7 @@
item_state = "apron"
blood_overlay_type = "armor"
body_parts_covered = CHEST|GROIN
allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants)
allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants)
//Captain
/obj/item/clothing/suit/captunic
code/modules/clothing/suits/miscellaneous.dm
+1 -1
View File
@@ -491,7 +491,7 @@
/obj/item/clothing/suit/hooded/wintercoat/hydro
name = "hydroponics winter coat"
icon_state = "coathydro"
allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants)
allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants)
hoodtype = /obj/item/clothing/head/winterhood/hydro
/obj/item/clothing/head/winterhood/hydro
code/modules/hydroponics/grown.dm
+1 -1
View File
@@ -57,7 +57,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params)
..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
if (istype(O, /obj/item/device/plant_analyzer))
var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>.\n"
if(seed)
msg += seed.get_analyzer_text()
code/modules/hydroponics/growninedible.dm
+1 -1
View File
@@ -34,7 +34,7 @@
/obj/item/weapon/grown/attackby(obj/item/O, mob/user, params)
..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
if (istype(O, /obj/item/device/plant_analyzer))
var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>\n"
if(seed)
msg += seed.get_analyzer_text()
code/modules/hydroponics/hydroitemdefines.dm
+1 -4
View File
@@ -1,5 +1,5 @@
// Plant analyzer
/obj/item/device/analyzer/plant_analyzer
/obj/item/device/plant_analyzer
name = "plant analyzer"
desc = "A scanner used to evaluate a plant's various areas of growth."
icon = 'icons/obj/device.dmi'
@@ -7,9 +7,6 @@
item_state = "analyzer"
origin_tech = "magnets=2;biotech=2"
/obj/item/device/analyzer/plant_analyzer/attack_self(mob/user)
return 0
// *************************************
// Hydroponics Tools
// *************************************
code/modules/hydroponics/hydroponics.dm
+1 -1
View File
@@ -734,7 +734,7 @@
else
user << "<span class='warning'>[src] already has seeds in it!</span>"
else if(istype(O, /obj/item/device/analyzer/plant_analyzer))
else if(istype(O, /obj/item/device/plant_analyzer))
if(myseed)
user << "*** <B>[myseed.plantname]</B> ***" //Carn: now reports the plants growing, not the seeds.
user << "- Plant Age: <span class='notice'>[age]</span>"
code/modules/hydroponics/seeds.dm
+1 -1
View File
@@ -227,7 +227,7 @@
return
/obj/item/seeds/attackby(obj/item/O, mob/user, params)
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
if (istype(O, /obj/item/device/plant_analyzer))
user << "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>.</span>"
var/text = get_analyzer_text()
if(text)
code/modules/jobs/job_types/cargo_service.dm
+1 -1
View File
@@ -196,7 +196,7 @@ Botanist
uniform = /obj/item/clothing/under/rank/hydroponics
suit = /obj/item/clothing/suit/apron
gloves =/obj/item/clothing/gloves/botanic_leather
suit_store = /obj/item/device/analyzer/plant_analyzer
suit_store = /obj/item/device/plant_analyzer
backpack = /obj/item/weapon/storage/backpack/botany
satchel = /obj/item/weapon/storage/backpack/satchel_hyd
code/modules/research/designs/autolathe_designs.dm
+1 -1
View File
@@ -292,7 +292,7 @@
id = "plant_analyzer"
build_type = AUTOLATHE
materials = list(MAT_METAL = 30, MAT_GLASS = 20)
build_path = /obj/item/device/analyzer/plant_analyzer
build_path = /obj/item/device/plant_analyzer
category = list("initial","Misc")
/datum/design/shovel