cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

bottlefix

Browse Source
This commit is contained in:
KasparoVy
2016-09-18 01:06:47 -04:00
parent bcb9cb676b
commit ffc0083098
12 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/jobs.dm
+1 -1
View File
@@ -38,7 +38,7 @@
item_state = "apron"
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
allowed = list (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/fertilizer,/obj/item/weapon/minihoe)
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/fertilizer,/obj/item/weapon/minihoe)
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
code/modules/hydroponics/beekeeping/beekeeper_suit.dm
+1 -1
View File
@@ -13,4 +13,4 @@
icon_state = "beekeeper"
item_state = "beekeeper"
flags = THICKMATERIAL
allowed = list (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/fertilizer,/obj/item/weapon/minihoe)
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/fertilizer,/obj/item/weapon/minihoe)
code/modules/hydroponics/hydro_reagents.dm
+9 -11
View File
@@ -32,7 +32,6 @@
/obj/item/weapon/plantspray/pests/old/carbaryl
name = "bottle of carbaryl"
icon_state = "bottle16"
toxicity = 4
pest_kill_str = 2
@@ -64,7 +63,6 @@
/obj/item/weedkiller/triclopyr
name = "bottle of glyphosate"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
toxicity = 4
weed_kill_str = 2
@@ -86,11 +84,11 @@
// Nutrient defines for hydroponics
// *************************************
/obj/item/weapon/reagent_containers/glass/fertilizer
/obj/item/weapon/reagent_containers/glass/bottle/fertilizer
name = "fertilizer bottle"
desc = "A small glass bottle. Can hold up to 10 units."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
icon_state = "round_bottle"
flags = OPENCONTAINER
possible_transfer_amounts = null
w_class = 2
@@ -101,7 +99,7 @@
amount_per_transfer_from_this = 10
volume = 10
/obj/item/weapon/reagent_containers/glass/fertilizer/New()
/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/New()
..()
src.pixel_x = rand(-5.0, 5)
@@ -110,17 +108,17 @@
if(fertilizer)
reagents.add_reagent(fertilizer,10)
/obj/item/weapon/reagent_containers/glass/fertilizer/ez
/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/ez
name = "bottle of E-Z-Nutrient"
icon_state = "bottle16"
icon_state = "round_bottle"
fertilizer = "eznutrient"
/obj/item/weapon/reagent_containers/glass/fertilizer/l4z
/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/l4z
name = "bottle of Left 4 Zed"
icon_state = "bottle18"
icon_state = "round_bottle"
fertilizer = "left4zed"
/obj/item/weapon/reagent_containers/glass/fertilizer/rh
/obj/item/weapon/reagent_containers/glass/bottle/fertilizer/rh
name = "bottle of Robust Harvest"
icon_state = "bottle15"
icon_state = "round_bottle"
fertilizer = "robustharvest"
code/modules/reagents/pandemic.dm
+1 -1
View File
@@ -122,7 +122,7 @@
if(name == null || wait)
return
var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(loc)
B.icon_state = "bottle3"
B.icon_state = "round_bottle"
B.pixel_x = rand(-3, 3)
B.pixel_y = rand(-3, 3)
replicator_cooldown(50)