mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 02:34:00 +00:00
[MIRROR] ports a bunch of grep checks from TG (#10361)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
committed by
GitHub
parent
21031b169b
commit
3cfc33bfde
@@ -112,4 +112,4 @@
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 10000)
|
||||
|
||||
/obj/item/ammo_magazine/mg42/empty
|
||||
initial_ammo = 0
|
||||
initial_ammo = 0
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
icon_state = "agshell"
|
||||
caliber = "12g"
|
||||
projectile_type = /obj/item/projectile/bullet/pellet/shotgun/silver
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 360, "silver" = 240)
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 360, "silver" = 240)
|
||||
|
||||
@@ -28,4 +28,4 @@
|
||||
projectile_type = /obj/item/projectile/bullet/rifle/a762/lmg
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a762/lmg
|
||||
icon_state = "bullet_alt"
|
||||
icon_state = "bullet_alt"
|
||||
|
||||
@@ -680,4 +680,4 @@
|
||||
/obj/item/ammo_magazine/s45lc/rifle
|
||||
name = "speedloader (.45 LC +P)"
|
||||
icon_state = "RI44"
|
||||
ammo_type = /obj/item/ammo_casing/a45lc/rifle
|
||||
ammo_type = /obj/item/ammo_casing/a45lc/rifle
|
||||
|
||||
@@ -217,4 +217,3 @@
|
||||
/obj/item/ammo_casing/a45lc/rubber
|
||||
desc = "A long silver bullet... Has a rubber tip, and .45 LC stamped into the base."
|
||||
projectile_type = /obj/item/projectile/bullet/rifle/a45lc/rubber
|
||||
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
/obj/item/gun
|
||||
var/holy = 0 //For Divinely blessed guns
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
item_state = "vox_hunting"
|
||||
ammo_type = /obj/item/ammo_casing/a762
|
||||
throwforce = 10
|
||||
force = 20
|
||||
force = 20
|
||||
|
||||
@@ -83,4 +83,4 @@
|
||||
if(ammo_magazine)
|
||||
icon_state = "[initial(icon_state)]"
|
||||
else
|
||||
icon_state = "[initial(icon_state)]-empty"
|
||||
icon_state = "[initial(icon_state)]-empty"
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
desc = "A high-power, fancy looking revolver that can stop nearly everything it's pointed at. Comes with a standard six-round-cylinder. There is ,Hesphiastos Industries, stamped along it's cylinder." // Yes I'm serious. -Spades
|
||||
icon_state = "cerb"
|
||||
icon = 'icons/obj/gun_yw.dmi'
|
||||
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
|
||||
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
|
||||
|
||||
@@ -32,4 +32,4 @@
|
||||
|
||||
/obj/item/gun/projectile/shotgun/doublebarrel/sawn/alt/holy
|
||||
ammo_type = /obj/item/ammo_casing/a12g/silver
|
||||
holy = 1
|
||||
holy = 1
|
||||
|
||||
@@ -86,4 +86,4 @@
|
||||
starts_with = list(/obj/item/ammo_casing/a12g/scatter = 8)
|
||||
|
||||
/obj/item/storage/box/scattershot/large
|
||||
starts_with = list(/obj/item/ammo_casing/a12g/scatter = 16)
|
||||
starts_with = list(/obj/item/ammo_casing/a12g/scatter = 16)
|
||||
|
||||
@@ -12,4 +12,4 @@
|
||||
pellets = 6
|
||||
range_step = 1
|
||||
spread_step = 20
|
||||
holy = 1
|
||||
holy = 1
|
||||
|
||||
Reference in New Issue
Block a user