cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make energy guns able to use burst fire. (#21005)

Browse Source 
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
This commit is contained in:
phil235
2016-11-02 16:16:21 +13:00
committed by oranges
parent c30441148e
commit b7efc2cef4
117 changed files with 4137 additions and 4121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/exports/weapons.dm
+4 -4
View File
@@ -19,7 +19,7 @@
/datum/export/weapon/taser
cost = 250
unit_name = "advanced taser"
export_types = list(/obj/item/weapon/gun/energy/gun/advtaser)
export_types = list(/obj/item/weapon/gun/energy/e_gun/advtaser)
/datum/export/weapon/laser
cost = 250
@@ -34,18 +34,18 @@
/datum/export/weapon/energy_gun
cost = 900
unit_name = "energy gun"
export_types = list(/obj/item/weapon/gun/energy/gun)
export_types = list(/obj/item/weapon/gun/energy/e_gun)
/datum/export/weapon/wt550
cost = 1400
unit_name = "WT-550 automatic rifle"
export_types = list(/obj/item/weapon/gun/projectile/automatic/wt550)
export_types = list(/obj/item/weapon/gun/ballistic/automatic/wt550)
/datum/export/weapon/shotgun
cost = 350
unit_name = "combat shotgun"
export_types = list(/obj/item/weapon/gun/projectile/shotgun/automatic/combat)
export_types = list(/obj/item/weapon/gun/ballistic/shotgun/automatic/combat)
/datum/export/weapon/flashbang
code/modules/cargo/packs.dm
+21 -21
View File
@@ -245,9 +245,9 @@ datum/supply_pack
/datum/supply_pack/security/taser
name = "Taser Crate"
cost = 1500
contains = list(/obj/item/weapon/gun/energy/gun/advtaser,
/obj/item/weapon/gun/energy/gun/advtaser,
/obj/item/weapon/gun/energy/gun/advtaser)
contains = list(/obj/item/weapon/gun/energy/e_gun/advtaser,
/obj/item/weapon/gun/energy/e_gun/advtaser,
/obj/item/weapon/gun/energy/e_gun/advtaser)
crate_name = "taser crate"
/datum/supply_pack/security/disabler
@@ -339,9 +339,9 @@ datum/supply_pack
/datum/supply_pack/security/armory/ballistic
name = "Combat Shotguns Crate"
cost = 2000
contains = list(/obj/item/weapon/gun/projectile/shotgun/automatic/combat,
/obj/item/weapon/gun/projectile/shotgun/automatic/combat,
/obj/item/weapon/gun/projectile/shotgun/automatic/combat,
contains = list(/obj/item/weapon/gun/ballistic/shotgun/automatic/combat,
/obj/item/weapon/gun/ballistic/shotgun/automatic/combat,
/obj/item/weapon/gun/ballistic/shotgun/automatic/combat,
/obj/item/weapon/storage/belt/bandolier,
/obj/item/weapon/storage/belt/bandolier,
/obj/item/weapon/storage/belt/bandolier)
@@ -350,8 +350,8 @@ datum/supply_pack
/datum/supply_pack/security/armory/energy
name = "Energy Guns Crate"
cost = 2500
contains = list(/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/gun/energy/gun)
contains = list(/obj/item/weapon/gun/energy/e_gun,
/obj/item/weapon/gun/energy/e_gun)
crate_name = "energy gun crate"
crate_type = /obj/structure/closet/crate/secure/plasma
@@ -373,8 +373,8 @@ datum/supply_pack
/datum/supply_pack/security/armory/wt550
name = "WT-550 Auto Rifle Crate"
cost = 3500
contains = list(/obj/item/weapon/gun/projectile/automatic/wt550,
/obj/item/weapon/gun/projectile/automatic/wt550)
contains = list(/obj/item/weapon/gun/ballistic/automatic/wt550,
/obj/item/weapon/gun/ballistic/automatic/wt550)
crate_name = "auto rifle crate"
/datum/supply_pack/security/armory/wt550ammo
@@ -1565,7 +1565,7 @@ datum/supply_pack
/obj/item/toy/carpplushie,
/obj/item/weapon/coin/antagtoken,
/obj/item/stack/tile/fakespace/loaded,
/obj/item/weapon/gun/projectile/shotgun/toy/crossbow,
/obj/item/weapon/gun/ballistic/shotgun/toy/crossbow,
/obj/item/toy/redbutton)
crate_name = "toy crate"
@@ -1611,22 +1611,22 @@ datum/supply_pack
/datum/supply_pack/misc/foamforce
name = "Foam Force Crate"
cost = 1000
contains = list(/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy,
/obj/item/weapon/gun/projectile/shotgun/toy)
contains = list(/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy,
/obj/item/weapon/gun/ballistic/shotgun/toy)
crate_name = "foam force crate"
/datum/supply_pack/misc/foamforce/bonus
name = "Foam Force Pistols Crate"
contraband = TRUE
cost = 4000
contains = list(/obj/item/weapon/gun/projectile/automatic/toy/pistol,
/obj/item/weapon/gun/projectile/automatic/toy/pistol,
contains = list(/obj/item/weapon/gun/ballistic/automatic/toy/pistol,
/obj/item/weapon/gun/ballistic/automatic/toy/pistol,
/obj/item/ammo_box/magazine/toy/pistol,
/obj/item/ammo_box/magazine/toy/pistol)
crate_name = "foam force crate"