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

Merge pull request #10632 from Kyep/trader_tweaks_2

Browse Source 
Sol Trader Updates 2
This commit is contained in:
variableundefined
2019-01-14 21:35:47 +08:00
committed by GitHub
parent 27177e049e a39a0df1f9
commit 1b6022ac93
9 changed files with 115 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/magazines.dm
+2 -1
View File
@@ -221,7 +221,7 @@
multiple_sprites = 1
/obj/item/ammo_box/magazine/enforcer
name = "handgun magazine (9mm)"
name = "handgun magazine (9mm rubber)"
icon_state = "enforcer"
ammo_type = /obj/item/ammo_casing/rubber9mm
max_ammo = 8
@@ -250,6 +250,7 @@
return 0
/obj/item/ammo_box/magazine/enforcer/lethal
name = "handgun magazine (9mm)"
ammo_type = /obj/item/ammo_casing/c9mm
/obj/item/ammo_box/magazine/wt550m9
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+1 -2
View File
@@ -142,11 +142,10 @@
/obj/item/gun/energy/kinetic_accelerator/experimental
name = "experimental kinetic accelerator"
desc = "A modified, far more dangerous version of the proto-kinetic accelerator, with half the cooldown and twice the modkit space of the standard version."
desc = "A modified version of the proto-kinetic accelerator, with twice the modkit space of the standard version."
icon_state = "kineticgun_h"
item_state = "kineticgun_h"
origin_tech = "combat=5;powerstorage=3;engineering=5"
overheat_time = 8
max_mod_capacity = 200
//Casing