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

Merge pull request #7164 from Steelpoint/ERTBalanceV1

Browse Source 
[BALANCE|FIX]ERT Balance Pass: 1 + Minor Ops Ship Fix
This commit is contained in:
Swag McYolosteinen
2015-01-23 17:16:33 +01:00
parent 7df272f3d6 399524dd36
commit 10ea66cb6b
8 changed files with 393 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/energy.dm
+7 -7
View File
@@ -39,22 +39,22 @@
fire_sound = 'sound/weapons/pulse.ogg'
/obj/item/ammo_casing/energy/laser/pulse/carbine
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/laser/carbine
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/electrode/carbine
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/laser/pulse/pistol
e_cost = 2000
e_cost = 100
/obj/item/ammo_casing/energy/laser/pistol
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/electrode/pistol
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/laser/bluetag
projectile_type = /obj/item/projectile/lasertag/bluetag
@@ -152,4 +152,4 @@
/obj/item/ammo_casing/energy/bolt/large
projectile_type = /obj/item/projectile/energy/bolt/large
select_name = "heavy bolt"
select_name = "heavy bolt"
code/modules/projectiles/guns/energy/pulse.dm
+8
View File
@@ -21,6 +21,10 @@
icon_state = "pulse_carbine"
item_state = "pulse"
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/carbine, /obj/item/ammo_casing/energy/electrode/carbine, /obj/item/ammo_casing/energy/laser/carbine)
cell_type = "/obj/item/weapon/stock_parts/cell"
/obj/item/weapon/gun/energy/pulse_rifle/pulse_carbine/loyalpin
pin = /obj/item/device/firing_pin/implant/loyalty
/obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol
name = "pulse pistol"
@@ -29,6 +33,10 @@
icon_state = "pulse_pistol"
item_state = "pulse"
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/pistol, /obj/item/ammo_casing/energy/electrode/pistol, /obj/item/ammo_casing/energy/laser/pistol)
cell_type = "/obj/item/weapon/stock_parts/cell"
/obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol/loyalpin
pin = /obj/item/device/firing_pin/implant/loyalty
/obj/item/weapon/gun/energy/pulse_rifle/destroyer
name = "pulse destroyer"