mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
2ae273e1b8
Collection of gear and changes from the four gear polls on the forums includes: 2 new automatic weapons, mapped in to ERT and random weapon spawns. Laser carbine balance. Slow emergency softsuits, no armor value other than bio and rad, 4 slowdown. 1 knife, not mapped in, available for Psi's uplink merge. New vests: 2 types, 2 pocket no slowdown, 4 pocket with slowdown, second is available from cargo and one random vest spawn in armory. The first replaces all instances of the old vests. Old vests still exist in code. Mercenary vest with no slowdown, 4 pockets, and slightly better armor, not on map, possibly for Nukes or Traitor Uplink Holster rearrangement for custom loadout. Acid dispenser, mapped into robotics and science. New food items, added to vendors and rations crate. New random medical spawns, added to medbay. Cargo and loadout additions to accommodate new items. 1 beanbag loaded 5 round shotgun added to Warden's closet to compensate for officers having .45 ltls and the HoS having an e-gun, suggested by IRC and server. http://baystation12.net/forums/viewtopic.php?f=5&t=12064 http://baystation12.net/forums/viewtopic.php?f=5&t=12031 http://baystation12.net/forums/viewtopic.php?f=5&t=12027 http://baystation12.net/forums/viewtopic.php?f=5&t=12007
201 lines
4.4 KiB
Plaintext
201 lines
4.4 KiB
Plaintext
/obj/item/ammo_magazine/a357
|
|
//name = "ammo box (.357)"
|
|
//desc = "A box of .357 ammo"
|
|
//icon_state = "357"
|
|
name = "speed loader (.357)"
|
|
icon_state = "T38"
|
|
caliber = "357"
|
|
ammo_type = /obj/item/ammo_casing/a357
|
|
max_ammo = 7
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/c38
|
|
name = "speed loader (.38)"
|
|
icon_state = "38"
|
|
caliber = "38"
|
|
ammo_type = /obj/item/ammo_casing/c38
|
|
max_ammo = 6
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/c38/rubber
|
|
name = "speed loader (.38 rubber)"
|
|
ammo_type = /obj/item/ammo_casing/c38r
|
|
|
|
/obj/item/ammo_magazine/c45m
|
|
name = "magazine (.45)"
|
|
icon_state = "45"
|
|
mag_type = MAGAZINE
|
|
ammo_type = /obj/item/ammo_casing/c45
|
|
caliber = ".45"
|
|
max_ammo = 7
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/c45m/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/c45m/rubber
|
|
name = "magazine (.45 rubber)"
|
|
ammo_type = /obj/item/ammo_casing/c45r
|
|
|
|
/obj/item/ammo_magazine/c45m/flash
|
|
name = "magazine (.45 flash)"
|
|
ammo_type = "/obj/item/ammo_casing/c45f"
|
|
|
|
/obj/item/ammo_magazine/mc9mm
|
|
name = "magazine (9mm)"
|
|
icon_state = "9x19p"
|
|
origin_tech = "combat=2"
|
|
mag_type = MAGAZINE
|
|
caliber = "9mm"
|
|
ammo_type = /obj/item/ammo_casing/c9mm
|
|
max_ammo = 10
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/mc9mm/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/mc9mm/flash
|
|
ammo_type = /obj/item/ammo_casing/c9mmf
|
|
|
|
/obj/item/ammo_magazine/c9mm
|
|
name = "ammunition Box (9mm)"
|
|
icon_state = "9mm"
|
|
origin_tech = "combat=2"
|
|
caliber = "9mm"
|
|
ammo_type = /obj/item/ammo_casing/c9mm
|
|
max_ammo = 30
|
|
|
|
/obj/item/ammo_magazine/c9mm/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/mc9mmt
|
|
name = "top mounted magazine (9mm)"
|
|
icon_state = "9mmt"
|
|
mag_type = MAGAZINE
|
|
ammo_type = /obj/item/ammo_casing/c9mm
|
|
caliber = "9mm"
|
|
max_ammo = 20
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/mc9mmt/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/mc9mmt/rubber
|
|
name = "top mounted magazine (9mm rubber)"
|
|
ammo_type = /obj/item/ammo_casing/c9mmr
|
|
|
|
/obj/item/ammo_magazine/c45
|
|
name = "ammunition Box (.45)"
|
|
icon_state = "9mm"
|
|
origin_tech = "combat=2"
|
|
caliber = ".45"
|
|
ammo_type = /obj/item/ammo_casing/c45
|
|
max_ammo = 30
|
|
|
|
/obj/item/ammo_magazine/c9mm/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/a12mm
|
|
name = "magazine (12mm)"
|
|
icon_state = "12mm"
|
|
origin_tech = "combat=2"
|
|
mag_type = MAGAZINE
|
|
caliber = "12mm"
|
|
ammo_type = "/obj/item/ammo_casing/a12mm"
|
|
max_ammo = 20
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/a12mm/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/a556
|
|
name = "magazine (5.56)"
|
|
icon_state = "5.56"
|
|
origin_tech = "combat=2"
|
|
mag_type = MAGAZINE
|
|
caliber = "a556"
|
|
ammo_type = /obj/item/ammo_casing/a556
|
|
max_ammo = 10
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/a556/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/a50
|
|
name = "magazine (.50)"
|
|
icon_state = "50ae"
|
|
origin_tech = "combat=2"
|
|
mag_type = MAGAZINE
|
|
caliber = ".50"
|
|
ammo_type = /obj/item/ammo_casing/a50
|
|
max_ammo = 7
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/a50/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/a75
|
|
name = "ammo magazine (20mm)"
|
|
icon_state = "75"
|
|
mag_type = MAGAZINE
|
|
caliber = "75"
|
|
ammo_type = /obj/item/ammo_casing/a75
|
|
multiple_sprites = 1
|
|
max_ammo = 4
|
|
|
|
/obj/item/ammo_magazine/a75/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/a762
|
|
name = "magazine box (7.62mm)"
|
|
icon_state = "a762"
|
|
origin_tech = "combat=2"
|
|
mag_type = MAGAZINE
|
|
caliber = "a762"
|
|
ammo_type = /obj/item/ammo_casing/a762
|
|
max_ammo = 50
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/a762/empty
|
|
initial_ammo = 0
|
|
|
|
/obj/item/ammo_magazine/c762
|
|
name = "magazine (7.62mm)"
|
|
icon_state = "c762"
|
|
mag_type = MAGAZINE
|
|
caliber = "a762"
|
|
ammo_type = /obj/item/ammo_casing/a762
|
|
max_ammo = 20
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/chameleon
|
|
name = "magazine (.45)"
|
|
icon_state = "45"
|
|
mag_type = MAGAZINE
|
|
caliber = ".45"
|
|
ammo_type = /obj/item/ammo_casing/chameleon
|
|
max_ammo = 7
|
|
multiple_sprites = 1
|
|
matter = list()
|
|
|
|
/obj/item/ammo_magazine/chameleon/empty
|
|
initial_ammo = 0
|
|
|
|
/*
|
|
//unused garbage
|
|
|
|
/obj/item/ammo_magazine/a418
|
|
name = "ammo box (.418)"
|
|
icon_state = "418"
|
|
ammo_type = "/obj/item/ammo_casing/a418"
|
|
max_ammo = 7
|
|
multiple_sprites = 1
|
|
|
|
/obj/item/ammo_magazine/a666
|
|
name = "ammo box (.666)"
|
|
icon_state = "666"
|
|
ammo_type = "/obj/item/ammo_casing/a666"
|
|
max_ammo = 4
|
|
multiple_sprites = 1
|
|
*/
|