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

Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01

Browse Source 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
This commit is contained in:
Leshana
2018-05-10 13:48:20 -04:00
parent c0c9ab541f 7075a65df0
commit 33202c5c38
38 changed files with 487 additions and 4230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/magazines.dm
+1 -1
View File
@@ -472,7 +472,7 @@
/obj/item/ammo_magazine/m44
name = "magazine (.44)"
icon_state = "44"
icon_state = "m44"
origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE
caliber = ".44"
code/modules/projectiles/guns/projectile/shotgun.dm
+3
View File
@@ -41,6 +41,9 @@
update_icon()
/obj/item/weapon/gun/projectile/shotgun/pump/slug
ammo_type = /obj/item/ammo_casing/a12g
/obj/item/weapon/gun/projectile/shotgun/pump/combat
name = "combat shotgun"
desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. Uses 12g rounds."