cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

oops

Browse Source 
forgot a few things
This commit is contained in:
Ocelot
2022-04-08 07:30:51 -04:00
parent 114dbb73a3
commit fc6c0038fe
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/ammunition/zz_autolathe_ch.dm
View File

@@ -86,17 +86,17 @@
path = /obj/item/ammo_magazine/akm/rubber path = /obj/item/ammo_magazine/akm/rubber
/datum/category_item/autolathe/arms/ak74 /datum/category_item/autolathe/arms/ak74
name = "AK74 magazine (5.45mm standard) name = "AK74 magazine (5.45mm standard)"
path = /obj/item/ammo_magazine/ak74 path = /obj/item/ammo_magazine/ak74
hidden = 1 hidden = 1
/datum/category_item/autolathe/arms/ak74/plum /datum/category_item/autolathe/arms/ak74/plum
name = "AK74 'plum' magazine (5.45mm standard) name = "AK74 'plum' magazine (5.45mm standard)"
path = /obj/item/ammo_magazine/ak74/plum path = /obj/item/ammo_magazine/ak74/plum
hidden = 1 hidden = 1
/datum/category_item/autolathe/arms/ak74/plum/rubber /datum/category_item/autolathe/arms/ak74/plum/rubber
name = "AK74 'plum' magazine (5.45mm less-lethal) name = "AK74 'plum' magazine (5.45mm less-lethal)"
path = /obj/item/ammo_magazine/ak74/plum/rubber path = /obj/item/ammo_magazine/ak74/plum/rubber
hidden = 1 hidden = 1
@@ -107,7 +107,7 @@
hidden = 1 hidden = 1
/datum/category_item/autolathe/arms/ak74_rubber /datum/category_item/autolathe/arms/ak74_rubber
name = "AK74 magazine (5.45mm less-lethal) name = "AK74 magazine (5.45mm less-lethal)"
path = /obj/item/ammo_magazine/ak74/rubber path = /obj/item/ammo_magazine/ak74/rubber
/datum/category_item/autolathe/arms/m16_556 /datum/category_item/autolathe/arms/m16_556

3
code/modules/projectiles/ammunition/zz_magazines_ch.dm
View File

@@ -99,6 +99,7 @@
/obj/item/ammo_magazine/asval/rubber /obj/item/ammo_magazine/asval/rubber
name = "AS-Val magazine(9x39mm less-lethal)" name = "AS-Val magazine(9x39mm less-lethal)"
icon_state = "asvalrubber"
matter = list(DEFAULT_WALL_MATERIAL = 1000) matter = list(DEFAULT_WALL_MATERIAL = 1000)
ammo_type = /obj/item/ammo_casing/a9x39/rubber ammo_type = /obj/item/ammo_casing/a9x39/rubber
@@ -157,6 +158,7 @@
/obj/item/ammo_magazine/ak74/rubber /obj/item/ammo_magazine/ak74/rubber
name = "AK74 magazine (5.45mm less-lethal)" name = "AK74 magazine (5.45mm less-lethal)"
icon_state = "545bakerubber"
matter = list(DEFAULT_WALL_MATERIAL = 1200) matter = list(DEFAULT_WALL_MATERIAL = 1200)
ammo_type = /obj/item/ammo_casing/a545/rubber ammo_type = /obj/item/ammo_casing/a545/rubber
@@ -165,6 +167,7 @@
/obj/item/ammo_magazine/ak74/plum/rubber /obj/item/ammo_magazine/ak74/plum/rubber
name = "AK74 magazine (5.45mm less-lethal)" name = "AK74 magazine (5.45mm less-lethal)"
icon_state = "545plumrubber"
matter = list(DEFAULT_WALL_MATERIAL = 1200) matter = list(DEFAULT_WALL_MATERIAL = 1200)
ammo_type = /obj/item/ammo_casing/a545/rubber ammo_type = /obj/item/ammo_casing/a545/rubber

4
code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
View File

@@ -334,7 +334,7 @@
/obj/item/weapon/gun/projectile/automatic/serdy/m41ab //This gun is pretty overpowered. Leaving it as an admin spawn. Might even interfere with lore. /obj/item/weapon/gun/projectile/automatic/serdy/m41ab //This gun is pretty overpowered. Leaving it as an admin spawn. Might even interfere with lore.
name = "M41A/2" name = "M41A/2"
desc = "The Armat M41A Pulse Rifle is a pulse-action assault rifle chambered for 10×24mm Caseless ammunition. This one is a rare, and fairly competent replica of the original by Scarborough Arms, with some minor design improvements over the original. The aluminium chassis is painted steel blue, and it has 'Scarborough Arms - Per falcis, per pravitas' inscribed on the stock." desc = "The Armat M41A Pulse Rifle is a pulse-action assault rifle chambered for 10×24mm Caseless ammunition. This one is a rare, and fairly competent replica of the original by Scarborough Arms, with some minor design improvements over the original. The aluminium chassis is painted steel blue, and it has 'Scarborough Arms - Per falcis, per pravitas' inscribed on the stock."
caliber = "10x24mm caseless" caliber = "10x24mm"
magazine_type = /obj/item/ammo_magazine/m41 magazine_type = /obj/item/ammo_magazine/m41
allowed_magazines = list(/obj/item/ammo_magazine/m41) allowed_magazines = list(/obj/item/ammo_magazine/m41)
icon_state="m41b" icon_state="m41b"
@@ -352,7 +352,7 @@
/obj/item/weapon/gun/projectile/automatic/serdy/m41a //This gun is pretty overpowered. Leaving it as an admin spawn. Might even interfere with lore. /obj/item/weapon/gun/projectile/automatic/serdy/m41a //This gun is pretty overpowered. Leaving it as an admin spawn. Might even interfere with lore.
name = "M41A" name = "M41A"
desc = "A tried and true original. The Armat M41A Pulse Rifle is a pulse-action assault rifle chambered for 10×24mm Caseless ammunition. 'PEACE THROUGH SUPERIOR FIREPOWER' is stamped into the side of the aluminium chassis." desc = "A tried and true original. The Armat M41A Pulse Rifle is a pulse-action assault rifle chambered for 10×24mm Caseless ammunition. 'PEACE THROUGH SUPERIOR FIREPOWER' is stamped into the side of the aluminium chassis."
caliber = "10x24mm caseless" caliber = "10x24mm"
magazine_type = /obj/item/ammo_magazine/m41 magazine_type = /obj/item/ammo_magazine/m41
allowed_magazines = list(/obj/item/ammo_magazine/m41) allowed_magazines = list(/obj/item/ammo_magazine/m41)
icon_state="m41a" icon_state="m41a"