cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

new makeshift weapon, removed makeshift laser rifle (#14081)

Browse Source 
* Update projectile.dmi

* Update launchers.dm

* hehehe

* bolts and stuff

* adds the fancy

* Update launchers.dm

* yea

* Update rocket.dm

* ssssssssss

* stuff

* Update launchers.dm

* aaaaaaaaaaaaa

* Update rocket.dm

* mhm

* begone

* Update rocket.dm

* Update ammo.dmi

* aaaaaaaaaaaaaaamhm
This commit is contained in:
cuackles
2022-06-02 07:21:55 -04:00
committed by GitHub
parent 2ca034a9b7
commit f541289656
10 changed files with 72 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/datums/components/crafting/makeshift.dm
View File

@@ -2,19 +2,6 @@
// GUNS //
//////////
/datum/crafting_recipe/makeshiftlasrifle
name = "Makeshift Laser Rifle"
result = /obj/item/gun/energy/laser/makeshiftlasrifle
reqs = list(/obj/item/stack/cable_coil = 15,
/obj/item/weaponcrafting/stock = 1,
/obj/item/pipe = 1,
/obj/item/light/bulb = 1,
/obj/item/stock_parts/cell = 1)
tools = list(TOOL_SCREWDRIVER)
time = 12 SECONDS
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/makeshiftpistol
name = "Makeshift Pistol"
result = /obj/item/gun/ballistic/automatic/pistol/makeshift
@@ -50,6 +37,20 @@
subcategory = CAT_WEAPON
always_availible = FALSE
/datum/crafting_recipe/gauss
name = "Makeshift gauss rifle"
reqs = list(/obj/item/stock_parts/cell = 1,
/obj/item/weaponcrafting/stock = 1,
/obj/item/weaponcrafting/receiver = 1,
/obj/item/stack/tape = 1,
/obj/item/stack/rods = 4,
/obj/item/stack/cable_coil = 10)
tools = list(TOOL_SCREWDRIVER,TOOL_WELDER,TOOL_WRENCH)
result = /obj/item/gun/ballistic/gauss
time = 12
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
///////////
// TOOLS //

10
code/datums/components/crafting/recipes.dm
View File

@@ -367,6 +367,15 @@
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/laserslug
name = "Bolts"
result = /obj/item/ammo_casing/caseless/bolts
reqs = list(/obj/item/stack/rods = 1)
tools = list(TOOL_WIRECUTTER)
time = 0.5 SECONDS
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/depleteduraniumslug
name = "Depleted Uranium Slug Shell"
result = /obj/item/ammo_casing/shotgun/uraniumpenetrator
@@ -389,6 +398,7 @@
category = CAT_WEAPONRY
subcategory = CAT_AMMO
/datum/crafting_recipe/ishotgun
name = "Improvised Shotgun"
result = /obj/item/gun/ballistic/shotgun/doublebarrel/improvised