cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Missed a few things.

Browse Source
This commit is contained in:
Spades
2017-06-20 01:04:07 -04:00
parent be2a99ca32
commit 79e192f565
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/ammunition/magazines.dm
View File

@@ -381,7 +381,7 @@
/obj/item/ammo_magazine/m556saw/empty
initial_ammo = 0
///////// .50 AE /////////
///////// .44 Magnum /////////
/obj/item/ammo_magazine/m44
name = "magazine (.44)"
@@ -394,13 +394,13 @@
max_ammo = 7
multiple_sprites = 1
/obj/item/ammo_magazine/m50/empty
/obj/item/ammo_magazine/m44/empty
initial_ammo = 0
/obj/item/ammo_magazine/clip/c50
name = "ammo clip (.50 AE)"
/obj/item/ammo_magazine/clip/c44
name = "ammo clip (.44)"
icon_state = "clip_pistol"
desc = "A stripper clip for reloading .50 Action Express rounds into magazines."
desc = "A stripper clip for reloading .44 rounds into magazines."
caliber = ".44"
ammo_type = /obj/item/ammo_casing/a44
matter = list(DEFAULT_WALL_MATERIAL = 1620) // metal costs are very roughly based around one .50 casing = 180 metal

6
code/modules/projectiles/guns/projectile/pistol.dm
View File

@@ -116,7 +116,7 @@
/obj/item/weapon/gun/projectile/deagle
name = "desert eagle"
desc = "A robust handgun that uses .50 AE rounds."
desc = "The perfect handgun for shooters with a need to hit targets through a wall and behind a fridge in your neighbor's house. Uses .44 rounds."
icon_state = "deagle"
item_state = "deagle"
force = 14.0
@@ -134,12 +134,12 @@
icon_state = "[initial(icon_state)]-e"
/obj/item/weapon/gun/projectile/deagle/gold
desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .50 AE rounds."
desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .44 rounds."
icon_state = "deagleg"
item_state = "deagleg"
/obj/item/weapon/gun/projectile/deagle/camo
desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE rounds."
desc = "A Deagle brand Deagle for operators operating operationally. Uses .44 rounds."
icon_state = "deaglecamo"
item_state = "deagleg"