cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds in Bola, Other Recipe Tweaks

Browse Source
This commit is contained in:
Fox-McCloud
2016-07-22 13:20:09 -04:00
parent 5a9681b5cd
commit fe8ef6ca69
14 changed files with 158 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/shoes/miscellaneous.dm
+1 -2
View File
@@ -177,12 +177,11 @@
/datum/crafting_recipe/shoe_rags
name = "Shoe Rags"
result = /obj/item/shoe_silencer
reqs = list(/obj/item/stack/tape_roll = 10)
tools = list(/obj/item/weapon/wirecutters)
time = 40
category = CAT_MISC
/obj/item/clothing/shoes/sandal/white
name = "White Sandals"
code/modules/crafting/recipes.dm
+32 -14
View File
@@ -23,7 +23,7 @@
/obj/item/device/assembly/igniter = 1,
/obj/item/weapon/reagent_containers/food/drinks/cans = 1)
parts = list(/obj/item/weapon/reagent_containers/food/drinks/cans = 1)
time = 80
time = 15
category = CAT_WEAPON
/datum/crafting_recipe/stunprod
@@ -33,10 +33,18 @@
/obj/item/stack/rods = 1,
/obj/item/weapon/wirecutters = 1,
/obj/item/weapon/stock_parts/cell = 1)
time = 80
time = 40
parts = list(/obj/item/weapon/stock_parts/cell = 1)
category = CAT_WEAPON
/datum/crafting_recipe/bola
name = "Bola"
result = /obj/item/weapon/restraints/legcuffs/bola
reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1,
/obj/item/stack/sheet/metal = 6)
time = 20//15 faster than crafting them by hand!
category= CAT_WEAPON
/datum/crafting_recipe/ed209
name = "ED209"
result = /mob/living/simple_animal/bot/ed209
@@ -52,7 +60,7 @@
/obj/item/device/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver)
time = 120
time = 60
category = CAT_ROBOT
/datum/crafting_recipe/secbot
@@ -64,7 +72,7 @@
/obj/item/device/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
tools = list(/obj/item/weapon/weldingtool)
time = 120
time = 60
category = CAT_ROBOT
/datum/crafting_recipe/cleanbot
@@ -73,7 +81,7 @@
reqs = list(/obj/item/weapon/reagent_containers/glass/bucket = 1,
/obj/item/device/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
time = 80
time = 40
category = CAT_ROBOT
/datum/crafting_recipe/floorbot
@@ -83,7 +91,7 @@
/obj/item/stack/tile/plasteel = 1,
/obj/item/device/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
time = 80
time = 40
category = CAT_ROBOT
/datum/crafting_recipe/medbot
@@ -93,7 +101,7 @@
/obj/item/weapon/storage/firstaid = 1,
/obj/item/device/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
time = 80
time = 40
category = CAT_ROBOT
/datum/crafting_recipe/flamethrower
@@ -103,7 +111,7 @@
/obj/item/device/assembly/igniter = 1,
/obj/item/stack/rods = 2)
tools = list(/obj/item/weapon/screwdriver)
time = 20
time = 10
category = CAT_WEAPON
/datum/crafting_recipe/meteorshot
@@ -171,7 +179,8 @@
name = "Overload Improvised Shell"
result = /obj/item/ammo_casing/shotgun/improvised/overload
reqs = list(/obj/item/ammo_casing/shotgun/improvised = 1,
/datum/reagent/blackpowder = 5)
/datum/reagent/blackpowder = 10,
/datum/reagent/plasma_dust = 20)
tools = list(/obj/item/weapon/screwdriver)
time = 5
category = CAT_AMMO
@@ -194,7 +203,16 @@
/obj/item/weaponcrafting/stock = 1,
/obj/item/stack/packageWrap = 5,)
tools = list(/obj/item/weapon/screwdriver)
time = 200
time = 100
category = CAT_WEAPON
/datum/crafting_recipe/spear
name = "Spear"
result = /obj/item/weapon/twohanded/spear
reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1,
/obj/item/weapon/shard = 1,
/obj/item/stack/rods = 1)
time = 40
category = CAT_WEAPON
/datum/crafting_recipe/spooky_camera
@@ -208,7 +226,7 @@
/datum/crafting_recipe/notreallysoap
name = "Homemade Soap"
result = /obj/item/weapon/soap/ducttape
time = 100
time = 50
reqs = list(/obj/item/stack/tape_roll = 1,
/datum/reagent/liquidgibs = 10)
@@ -224,7 +242,7 @@
/datum/crafting_recipe/makeshift_bolt
name = "Makeshift Bolt"
result = /obj/item/weapon/arrow/rod
time = 15
time = 5
reqs = list(/obj/item/stack/rods = 1)
tools = list(/obj/item/weapon/weldingtool)
category = CAT_AMMO
@@ -232,7 +250,7 @@
/datum/crafting_recipe/crossbow
name = "Powered Crossbow"
result = /obj/item/weapon/gun/throw/crossbow
time = 300
time = 150
reqs = list(/obj/item/stack/rods = 3,
/obj/item/stack/cable_coil = 10,
/obj/item/stack/sheet/mineral/plastic = 3,
@@ -246,4 +264,4 @@
result = /obj/item/latexballon
time = 15
reqs = list(/obj/item/clothing/gloves/color/latex = 1,
/obj/item/stack/cable_coil = 5)
/obj/item/stack/cable_coil = 5)
code/modules/projectiles/ammunition/ammo_casings.dm
+9 -7
View File
@@ -99,6 +99,7 @@
projectile_type = /obj/item/projectile/bullet
materials = list(MAT_METAL=4000)
/obj/item/ammo_casing/shotgun/buckshot
name = "buckshot shell"
desc = "A 12 gauge buckshot shell."
@@ -116,6 +117,7 @@
variance = 25
materials = list(MAT_METAL=4000)
/obj/item/ammo_casing/shotgun/beanbag
name = "beanbag slug"
desc = "A weak beanbag slug for riot control."
@@ -123,15 +125,17 @@
projectile_type = /obj/item/projectile/bullet/weakbullet/rubber
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/shotgun/improvised
name = "improvised shell"
desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
icon_state = "gshell"
icon_state = "improvshell"
projectile_type = /obj/item/projectile/bullet/pellet/weak
materials = list(MAT_METAL=250)
pellets = 5
pellets = 10
variance = 25
/obj/item/ammo_casing/shotgun/improvised/overload
name = "overloaded improvised shell"
desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \
@@ -139,12 +143,9 @@
icon_state = "improvshell"
projectile_type = /obj/item/projectile/bullet/pellet/overload
materials = list(MAT_METAL=250)
pellets = 5
pellets = 4
variance = 40
/obj/item/ammo_casing/shotgun/improvised/overload/New()
..()
pellets = rand(3, 8)
/obj/item/ammo_casing/shotgun/stunslug
name = "taser slug"
@@ -153,6 +154,7 @@
projectile_type = /obj/item/projectile/bullet/stunshot
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/shotgun/meteorshot
name = "meteorshot shell"
desc = "A shotgun shell rigged with CMC technology, which launches a massive slug when fired."
@@ -206,7 +208,7 @@
name = "laser slug"
desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a laser weapon in a ballistic package."
icon_state = "lshell"
projectile_type = /obj/item/projectile/beam
projectile_type = /obj/item/projectile/beam/laser
/obj/item/ammo_casing/shotgun/techshell
name = "unloaded technological shell"
code/modules/projectiles/projectile/bullets.dm
+1 -1
View File
@@ -59,7 +59,7 @@
..()
if(istype(target, /mob/living/carbon))
var/mob/living/carbon/M = target
M.adjust_fire_stacks(1)
M.adjust_fire_stacks(4)
M.IgniteMob()
/obj/item/projectile/bullet/incendiary/firebullet
code/modules/research/designs/mechfabricator_designs.dm
+5 -5
View File
@@ -837,13 +837,13 @@
construction_time = 100
category = list("Exosuit Equipment")
/datum/design/mech_bolas
name = "Exosuit Weapon Design (PCMK-6 Bolas Launcher)"
desc = "Allows for the construction of PCMK-6 Bolas Launcher."
id = "mech_bolas"
/datum/design/mech_bola
name = "Exosuit Weapon Design (PCMK-6 Bola Launcher)"
desc = "Allows for the construction of PCMK-6 Bola Launcher."
id = "mech_bola"
build_type = MECHFAB
req_tech = list("combat" = 3)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bola
materials = list(MAT_METAL=10000)
construction_time = 100
category = list("Exosuit Equipment")