Skip to content

Commit

Permalink
Gun Runners update and SELHOZ BLYAT
Browse files Browse the repository at this point in the history
  • Loading branch information
iWuna committed Jul 21, 2019
1 parent 931eda9 commit 22fd3c7
Show file tree
Hide file tree
Showing 26 changed files with 95 additions and 72 deletions.
19 changes: 18 additions & 1 deletion code/modules/crafting/recipes/blueprint/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,21 @@

/obj/item/blueprint/laser_rcw
name = "RCW blueprint"
recipe = /datum/crafting_recipe/laser_rcw
recipe = /datum/crafting_recipe/laser_rcw


///bench///

/obj/item/blueprint/bench
name = "Weapon Crafting Bench"
icon_state = "bench"
density = 1
anchored = 1
recipe = list(/datum/crafting_recipe/trail_carbine, /datum/crafting_recipe/assault_rifle, /datum/crafting_recipe/pipegun, /datum/crafting_recipe/rifle308, /datum/crafting_recipe/smg10mm, /datum/crafting_recipe/a_rifle308, /datum/crafting_recipe/n99)

/obj/item/blueprint/bench_laser
name = "Energy Weapon Crafting Bench"
icon_state = "bench_l"
density = 1
anchored = 1
recipe = list(/datum/crafting_recipe/laser_rcw, /datum/crafting_recipe/laser_tri, /datum/crafting_recipe/laser_rifle13, /datum/crafting_recipe/laser_rifle9, /datum/crafting_recipe/laser_pistol, /datum/crafting_recipe/plasma_pistol)
36 changes: 18 additions & 18 deletions code/modules/crafting/recipes/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/obj/item/stack/sheet/metal = 3,
/obj/item/stack/sheet/plasteel = 5)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 1000
category = CAT_WEAPON
XP = 200

Expand All @@ -52,7 +52,7 @@
/obj/item/stack/sheet/metal = 2,
/obj/item/stack/sheet/plasteel = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 500
default = 1
category = CAT_WEAPON
XP = 75
Expand All @@ -65,7 +65,7 @@
/obj/item/stack/sheet/metal = 3,
/obj/item/stack/sheet/mineral/wood = 3)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 500
category = CAT_WEAPON
XP = 120

Expand All @@ -77,7 +77,7 @@
/obj/item/stack/sheet/metal = 2,
/obj/item/stack/sheet/plasteel = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 500
category = CAT_WEAPON
XP = 100

Expand All @@ -89,7 +89,7 @@
/obj/item/stack/sheet/metal = 3,
/obj/item/stack/sheet/mineral/wood = 3)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 500
category = CAT_WEAPON
XP = 110

Expand All @@ -101,7 +101,7 @@
/obj/item/stack/sheet/metal = 1,
/obj/item/stack/sheet/mineral/wood = 2)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 500
default = 1
category = CAT_WEAPON
XP = 40
Expand All @@ -114,7 +114,7 @@
/obj/item/stack/sheet/metal = 3,
/obj/item/stack/sheet/plasteel = 2)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 500
category = CAT_WEAPON
XP = 140

Expand All @@ -125,7 +125,7 @@
/obj/item/weaponcrafting/stock = 1,
/obj/item/stack/sheet/metal = 3)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 500
category = CAT_WEAPON
XP = 120

Expand All @@ -141,7 +141,7 @@
/obj/item/crafting/resistor = 1, /obj/item/crafting/board = 1, /obj/item/stack/cable_coil = 9,
/obj/item/weapon/stock_parts/cell = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 850
category = CAT_WEAPON
XP = 250

Expand All @@ -155,7 +155,7 @@
/obj/item/crafting/resistor = 1, /obj/item/crafting/board = 1, /obj/item/stack/cable_coil = 7,
/obj/item/weapon/stock_parts/cell = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 800
category = CAT_WEAPON
XP = 175

Expand All @@ -169,7 +169,7 @@
/obj/item/crafting/resistor = 1, /obj/item/crafting/board = 1,
/obj/item/stack/cable_coil = 6, /obj/item/weapon/stock_parts/cell = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 750
category = CAT_WEAPON
XP = 140

Expand All @@ -182,7 +182,7 @@
/obj/item/crafting/transistor = 7, /obj/item/crafting/capacitor = 15,
/obj/item/crafting/resistor = 3, /obj/item/crafting/board = 1,
/obj/item/stack/cable_coil = 15, /obj/item/weapon/stock_parts/cell = 1)
time = 400
time = 900
category = CAT_WEAPON
XP = 400

Expand All @@ -196,7 +196,7 @@
/obj/item/crafting/resistor = 5, /obj/item/crafting/board = 2,
/obj/item/stack/cable_coil = 30, /obj/item/weapon/stock_parts/cell = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 1200
category = CAT_WEAPON
XP = 500

Expand All @@ -212,7 +212,7 @@
/obj/item/crafting/bulb = 1, /obj/item/stack/cable_coil = 2,
/obj/item/weapon/stock_parts/cell = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 800
category = CAT_WEAPON
XP = 150

Expand All @@ -227,7 +227,7 @@
/obj/item/crafting/bulb = 1, /obj/item/stack/cable_coil = 6,
/obj/item/weapon/stock_parts/cell = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 800
category = CAT_WEAPON
XP = 200

Expand All @@ -242,7 +242,7 @@
/obj/item/crafting/bulb = 1, /obj/item/stack/cable_coil = 13,
/obj/item/weapon/stock_parts/cell = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 800
category = CAT_WEAPON
XP = 250

Expand All @@ -257,7 +257,7 @@
/obj/item/crafting/bulb = 3, /obj/item/stack/cable_coil = 20,
/obj/item/weapon/stock_parts/cell = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 800
category = CAT_WEAPON
XP = 300

Expand All @@ -272,6 +272,6 @@
/obj/item/crafting/bulb = 1, /obj/item/stack/cable_coil = 15,
/obj/item/weapon/stock_parts/cell = 1)
tools = list(/obj/item/weapon/screwdriver)
time = 400
time = 800
category = CAT_WEAPON
XP = 400
6 changes: 3 additions & 3 deletions code/modules/fallout/obj/flora/farming.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
yield = 2
growthstages = 3
production = 4
maturation = 4
maturation = 20
growing_icon = 'icons/fallout/flora/flora.dmi'
icon_grow = "broc-grow"
icon_dead = "broc-dead"
Expand All @@ -35,7 +35,7 @@
yield = 1
growthstages = 3
production = 1
maturation = 1
maturation = 10
growing_icon = 'icons/fallout/flora/flora.dmi'
icon_grow = "xander-grow"
icon_dead = "xander-dead"
Expand All @@ -55,7 +55,7 @@
yield = 3
growthstages = 3
production = 5
maturation = 5
maturation = 15
growing_icon = 'icons/fallout/flora/flora.dmi'
icon_grow = "mutfruit-grow"
icon_dead = "mutfruit-dead"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/apple.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
species = "goldapple"
plantname = "Golden Apple Tree"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold
maturation = 10
maturation = 40
production = 10
mutatelist = list()
reagents_add = list("gold" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/beans.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
species = "soybean"
plantname = "Soybean Plants"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
maturation = 4
maturation = 20
production = 4
potency = 15
growthstages = 4
Expand Down
6 changes: 3 additions & 3 deletions code/modules/hydroponics/grown/berries.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
plantname = "Berry Bush"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/berries
lifespan = 20
maturation = 5
maturation = 20
production = 5
yield = 2
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
Expand Down Expand Up @@ -99,7 +99,7 @@
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cherries
lifespan = 35
endurance = 35
maturation = 5
maturation = 20
production = 5
growthstages = 5
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
Expand Down Expand Up @@ -148,7 +148,7 @@
product = /obj/item/weapon/reagent_containers/food/snacks/grown/grapes
lifespan = 50
endurance = 25
maturation = 3
maturation = 15
production = 5
yield = 4
growthstages = 2
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/cannabis.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
species = "cannabis"
plantname = "Cannabis Plant"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cannabis
maturation = 8
maturation = 30
potency = 20
growthstages = 1
growing_icon = 'goon/icons/obj/hydroponics.dmi'
Expand Down
6 changes: 3 additions & 3 deletions code/modules/hydroponics/grown/chili.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
plantname = "Chili Plants"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/chili
lifespan = 20
maturation = 5
maturation = 20
production = 5
yield = 4
potency = 20
Expand Down Expand Up @@ -35,7 +35,7 @@
plantname = "Ice Pepper Plants"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
lifespan = 25
maturation = 4
maturation = 15
production = 4
rarity = 20
mutatelist = list()
Expand All @@ -59,7 +59,7 @@
plantname = "Ghost Chili Plants"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili
endurance = 10
maturation = 10
maturation = 40
production = 10
yield = 3
rarity = 20
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/cocoa_vanilla.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
plantname = "Cocao Tree"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod
lifespan = 20
maturation = 5
maturation = 20
production = 5
yield = 2
growthstages = 5
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/corn.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
species = "corn"
plantname = "Corn Stalks"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/corn
maturation = 8
maturation = 40
potency = 20
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
Expand Down
4 changes: 2 additions & 2 deletions code/modules/hydroponics/grown/flowers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
plantname = "Poppy Plants"
product = /obj/item/weapon/reagent_containers/food/snacks/grown/poppy
endurance = 10
maturation = 8
maturation = 40
yield = 6
potency = 20
growthstages = 3
Expand Down Expand Up @@ -71,7 +71,7 @@
product = /obj/item/weapon/reagent_containers/food/snacks/grown/harebell
lifespan = 100
endurance = 20
maturation = 7
maturation = 35
production = 1
yield = 2
potency = 30
Expand Down
6 changes: 3 additions & 3 deletions code/modules/hydroponics/grown/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
plantname = "Starthistle"
lifespan = 100
endurance = 50 // damm pesky weeds
maturation = 5
maturation = 20
production = 1
yield = -1
potency = -1
Expand All @@ -25,7 +25,7 @@
product = /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage
lifespan = 50
endurance = 25
maturation = 3
maturation = 15
production = 5
yield = 4
growthstages = 1
Expand Down Expand Up @@ -54,7 +54,7 @@
genes = list(/datum/plant_gene/trait/repeated_harvest)
lifespan = 60
endurance = 50
maturation = 3
maturation = 15
yield = 4
growthstages = 3
reagents_add = list("sugar" = 0.25)
Expand Down
Loading

0 comments on commit 22fd3c7

Please sign in to comment.