Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions code/modules/projectiles/guns/ballistic/automatic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,10 @@
/obj/item/gun/ballistic/automatic/smg/american180
name = "American 180"
desc = "An integrally suppressed submachinegun chambered in the common .22 long rifle. Top loaded drum magazine."
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "smg22"
item_state = "shotgun"
item_state = "american"
mag_type = /obj/item/ammo_box/magazine/m22smg
init_mag_type = /obj/item/ammo_box/magazine/m22smg
weapon_class = WEAPON_CLASS_CARBINE
Expand Down Expand Up @@ -518,6 +520,8 @@
/obj/item/gun/ballistic/automatic/smg/p90
name = "FN P90c"
desc = "The Fabrique Nationale P90c was just coming into use at the time of the war. The weapon's bullpup layout, and compact design, make it easy to control. The durable P90c is prized for its reliability, and high firepower in a ruggedly-compact package. Chambered in 10mm."
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "p90"
item_state = "m90"
mag_type = /obj/item/ammo_box/magazine/m10mm_p90
Expand Down Expand Up @@ -571,8 +575,10 @@
/obj/item/gun/ballistic/automatic/smg/mp5
name = "MP-5 SD"
desc = "An integrally suppressed submachinegun chambered in 9mm."
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "mp5"
item_state = "fnfal"
item_state = "mp5"
mag_type = /obj/item/ammo_box/magazine/uzim9mm
init_mag_type = /obj/item/ammo_box/magazine/uzim9mm
weapon_class = WEAPON_CLASS_CARBINE
Expand Down Expand Up @@ -1797,6 +1803,8 @@
name = "r91 assault rifle"
desc = "The R91 was the standard US Army assault rifle, and so saw wide-spread use after the war. Most are worn out by now."
icon = 'icons/obj/guns/projectile.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "assault_rifle"
item_state = "r91"
mag_type = /obj/item/ammo_box/magazine/m556/rifle
Expand Down Expand Up @@ -1831,6 +1839,8 @@
name = "infiltrator"
desc = "A customized R91 assault rifle, with an integrated suppressor, small scope, cut down stock and polymer furniture. The supressor takes away stopping-power, but a cleaner action allows it to fire faster."
icon = 'icons/obj/guns/projectile.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "infiltrator"
item_state = "infiltrator"
weapon_class = WEAPON_CLASS_RIFLE
Expand Down Expand Up @@ -2341,8 +2351,10 @@
/obj/item/gun/ballistic/automatic/g11
name = "G11"
desc = "This experimental gun fires a caseless cartridge consisting of a block of propellant with a bullet buried inside. The weight and space savings allows for a very high magazine capacity. Chambered in 4.73mm."
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "g11"
item_state = "arg"
item_state = "h&kg11"
mag_type = /obj/item/ammo_box/magazine/m473
init_mag_type = /obj/item/ammo_box/magazine/m473
disallowed_mags = list(/obj/item/ammo_box/magazine/m473/small, /obj/item/ammo_box/magazine/m473/small/empty)
Expand Down Expand Up @@ -2633,6 +2645,8 @@
name = "\improper M72 gauss rifle"
desc = "The M72 rifle is of German design. It uses an electromagnetic field to propel rounds at tremendous speed... and pierce almost any obstacle. Its range, accuracy and stopping power is almost unparalleled."
icon = 'icons/fallout/objects/guns/ballistic.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "gaussf2"
item_state = "gaussrifle"
slot_flags = ITEM_SLOT_BACK
Expand Down
6 changes: 4 additions & 2 deletions code/modules/projectiles/guns/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
desc = "A traditional hunting shotgun with wood furniture and a four-shell capacity underneath."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "hunting_shotgun"
item_state = "hunting_shotgun"
item_state = "shotgunpump"
icon_prefix = "shotgunpump"
mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
weapon_class = WEAPON_CLASS_RIFLE
Expand Down Expand Up @@ -611,8 +611,10 @@
/obj/item/gun/ballistic/automatic/shotgun/pancor
name = "Pancor Jackhammer"
desc = "A drum-loaded, fully automatic shotgun. The pinnacle of turning things into swiss cheese."
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "pancor"
item_state = "cshotgun1"
item_state = "pancor"
fire_sound = 'sound/f13weapons/repeater_fire.ogg'
mag_type = /obj/item/ammo_box/magazine/d12g
weapon_class = WEAPON_CLASS_RIFLE
Expand Down