cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 03:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets

Browse Source 
Gun Revamp 2: Gun Harder: Director's Cut
This commit is contained in:
Cheridan
2014-01-14 11:10:05 -08:00
parent 24e06f64b7 0829de6ffc
commit 8aaf10feb4
34 changed files with 514 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/autolathe.dm
View File

@@ -32,7 +32,6 @@ var/global/list/autolathe_recipes = list( \
new /obj/item/weapon/hemostat(),\
new /obj/item/weapon/reagent_containers/glass/beaker(), \
new /obj/item/weapon/reagent_containers/glass/beaker/large(), \
new /obj/item/ammo_casing/shotgun/blank(), \
new /obj/item/ammo_casing/shotgun/beanbag(), \
new /obj/item/ammo_box/c38(), \
new /obj/item/device/taperecorder/empty(), \
@@ -57,6 +56,7 @@ var/global/list/autolathe_recipes_hidden = list( \
new /obj/item/weapon/handcuffs(), \
new /obj/item/ammo_box/a357(), \
new /obj/item/ammo_casing/shotgun(), \
new /obj/item/ammo_casing/shotgun/buckshot(), \
new /obj/item/ammo_casing/shotgun/dart(), \
/* new /obj/item/weapon/shield/riot(), */ \
)

3
code/game/machinery/portable_turret.dm
View File

@@ -67,7 +67,8 @@
sound = 1
else
var/obj/item/weapon/gun/energy/E=new installation //All energy-based weapons are applicable
projectile = E.projectile_type
var/obj/item/ammo_casing/shottype = E.ammo_type[1]
projectile = shottype.projectile_type
eprojectile = projectile
switch(E.type)

4
code/game/machinery/rechargestation.dm
View File

@@ -277,7 +277,9 @@
O:icon_state = "flash"
if(istype(O,/obj/item/weapon/gun/energy/taser/cyborg))
if(O:power_supply.charge < O:power_supply.maxcharge)
O:power_supply.give(O:charge_cost * coeff)
var/obj/item/weapon/gun/energy/G = O
var/obj/item/ammo_casing/energy/S = G.ammo_type[G.select]
O:power_supply.give(S.e_cost * coeff)
O:update_icon()
else
O:charge_tick = 0

4
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -145,7 +145,7 @@
new /obj/item/weapon/dnainjector/m2h(src)
new /obj/item/weapon/dnainjector/m2h(src)
/obj/item/weapon/storage/box/blanks
/*/obj/item/weapon/storage/box/blanks //Blanks removed, go home
name = "box of blank shells"
desc = "It has a picture of a gun and several warning symbols on the front."
@@ -157,7 +157,7 @@
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)*/
/obj/item/weapon/storage/box/flashbangs
name = "box of flashbangs (WARNING)"