mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 22:50:26 +01:00
CIN Evilguns | The gunnenshootening pt 3 | Long live the king | Slight rework of the CIN surplus company (#24304)
* scream if you love poland !!!! * oh yeah its all coming together * WAR * dme fixes before i break everything * f1 * WHAGG * expect more similarly poorly named commits in the future * war pt 2 * ooprs * sharpshooter icon fix * that should be everything actually * i forgot demo mod exists * deletes now unused ak ammo * thats not real anymore * every test failure ever * reduces the weapon weight of the bobr * tweaks opfor weapons since they all changed since i last saw them * fixes the plasma pistols and tweaks their numbers a little * deletes the luk, delete lanca proj dam mod, decreases lanca firerate * tweaks the outfits that use these guns a bit and makes the miecz one han * removes the luk from that one mapping helper * puts the sakhno back on order * tweaks around the lanca's ammo capacity * updates the milsim domain stuff * fixes some of the stuff * makes the lanca and miecz magazines not normal size --------- Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
Paxilmaniac
co-authored by
GoldenAlpharex
GoldenAlpharex
parent
85b41b621f
commit
30d7788c35
@@ -362,12 +362,12 @@
|
||||
/obj/structure/closet/crate/secure/weapon{
|
||||
name = "Surplus Firearms"
|
||||
},
|
||||
/obj/item/gun/ballistic/automatic/akm/civvie,
|
||||
/obj/item/gun/ballistic/automatic/akm/civvie,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/obj/item/gun/ballistic/automatic/lanca,
|
||||
/obj/item/gun/ballistic/automatic/lanca,
|
||||
/obj/item/ammo_box/magazine/lanca,
|
||||
/obj/item/ammo_box/magazine/lanca,
|
||||
/obj/item/ammo_box/magazine/lanca,
|
||||
/obj/item/ammo_box/magazine/lanca,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/ruin/space/has_grav/cargodise_freighter/cargo)
|
||||
"fl" = (
|
||||
@@ -1903,8 +1903,8 @@
|
||||
/area/ruin/space/has_grav/cargodise_freighter/bridge)
|
||||
"ES" = (
|
||||
/obj/structure/rack/gunrack,
|
||||
/obj/item/gun/ballistic/automatic/akm,
|
||||
/obj/item/gun/ballistic/automatic/akm{
|
||||
/obj/item/gun/ballistic/automatic/lanca,
|
||||
/obj/item/gun/ballistic/automatic/lanca{
|
||||
pixel_x = 3
|
||||
},
|
||||
/turf/open/floor/mineral/plastitanium/red,
|
||||
|
||||
@@ -9,22 +9,6 @@
|
||||
},
|
||||
/turf/open/floor/engine/hull/reinforced,
|
||||
/area/shuttle/pirate/nri)
|
||||
"aW" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/storage/box/flashes{
|
||||
pixel_x = -2
|
||||
},
|
||||
/obj/item/storage/box/zipties{
|
||||
pixel_x = 2
|
||||
},
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/gun/energy/e_gun/advtaser/normal,
|
||||
/obj/item/gun/energy/e_gun/advtaser/normal,
|
||||
/obj/item/gun/energy/e_gun/advtaser/normal,
|
||||
/turf/open/floor/pod,
|
||||
/area/shuttle/pirate/nri)
|
||||
"be" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/modular_computer/laptop/preset/civilian,
|
||||
@@ -157,8 +141,17 @@
|
||||
/obj/structure/rack/shelf,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/machinery/light/small/red/directional/north,
|
||||
/obj/item/storage/toolbox/ammobox/full/nri_smg,
|
||||
/obj/item/storage/toolbox/ammobox/full/nri_smg,
|
||||
/obj/item/ammo_box/c27_54cesarzowa,
|
||||
/obj/item/ammo_box/c27_54cesarzowa,
|
||||
/obj/item/ammo_box/c27_54cesarzowa/rubber{
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/ammo_box/c27_54cesarzowa/rubber{
|
||||
pixel_y = 6
|
||||
},
|
||||
/obj/item/ammo_box/magazine/miecz,
|
||||
/obj/item/ammo_box/magazine/miecz,
|
||||
/obj/item/ammo_box/magazine/miecz,
|
||||
/turf/open/floor/pod/light,
|
||||
/area/shuttle/pirate/nri)
|
||||
"fJ" = (
|
||||
@@ -233,7 +226,6 @@
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/autoname,
|
||||
/obj/docking_port/mobile/pirate/nri_raider{
|
||||
dir = 1;
|
||||
launch_status = 0
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
@@ -256,7 +248,6 @@
|
||||
},
|
||||
/obj/machinery/computer/shuttle/pirate/nri{
|
||||
dir = 8;
|
||||
name = "police shuttle console";
|
||||
req_access = list("syndicate")
|
||||
},
|
||||
/turf/open/floor/carpet/green,
|
||||
@@ -275,6 +266,17 @@
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/pod/light,
|
||||
/area/shuttle/pirate/nri)
|
||||
"kq" = (
|
||||
/obj/structure/rack/gunrack,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/gun/ballistic/shotgun/riot{
|
||||
pixel_x = -4
|
||||
},
|
||||
/obj/item/gun/ballistic/automatic/miecz,
|
||||
/turf/open/floor/pod,
|
||||
/area/shuttle/pirate/nri)
|
||||
"kQ" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 10
|
||||
@@ -374,7 +376,7 @@
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/pod,
|
||||
/area/shuttle/pirate/nri)
|
||||
"pt" = (
|
||||
"pg" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
@@ -462,15 +464,6 @@
|
||||
/obj/machinery/recharger,
|
||||
/turf/open/floor/pod/light,
|
||||
/area/shuttle/pirate/nri)
|
||||
"rk" = (
|
||||
/obj/structure/rack/gunrack,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/gun/ballistic/automatic/nri_smg,
|
||||
/obj/item/gun/ballistic/shotgun/automatic/combat/compact,
|
||||
/turf/open/floor/pod,
|
||||
/area/shuttle/pirate/nri)
|
||||
"rp" = (
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/obj/structure/cable,
|
||||
@@ -511,6 +504,22 @@
|
||||
/obj/machinery/power/terminal,
|
||||
/turf/open/floor/plating,
|
||||
/area/shuttle/pirate/nri)
|
||||
"ts" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/storage/box/flashes{
|
||||
pixel_x = -2
|
||||
},
|
||||
/obj/item/storage/box/zipties{
|
||||
pixel_x = 2
|
||||
},
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/melee/baton,
|
||||
/obj/item/gun/energy/e_gun/advtaser/normal,
|
||||
/obj/item/gun/energy/e_gun/advtaser/normal,
|
||||
/obj/item/gun/energy/e_gun/advtaser/normal,
|
||||
/turf/open/floor/pod,
|
||||
/area/shuttle/pirate/nri)
|
||||
"ty" = (
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/power/terminal{
|
||||
@@ -523,9 +532,9 @@
|
||||
/obj/structure/lattice/catwalk,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/pirate/nri)
|
||||
"tN" = (
|
||||
"uh" = (
|
||||
/obj/structure/rack/gunrack,
|
||||
/obj/item/gun/ballistic/automatic/akm/civvie,
|
||||
/obj/item/gun/ballistic/automatic/lanca,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
@@ -804,25 +813,6 @@
|
||||
},
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/shuttle/pirate/nri)
|
||||
"CC" = (
|
||||
/obj/machinery/light/small/red/directional/south,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/closet/crate/secure/weapon{
|
||||
name = "footlocker";
|
||||
desc = "A secure crate to keep all your personal belongings in.";
|
||||
anchored = 1
|
||||
},
|
||||
/obj/item/clothing/glasses/hud/health,
|
||||
/obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper,
|
||||
/obj/item/clothing/mask/balaclavaadjust,
|
||||
/obj/item/storage/belt/military/cin_surplus/marine,
|
||||
/obj/item/clothing/head/helmet/nri_police,
|
||||
/obj/item/clothing/suit/armor/vest/nri_police,
|
||||
/obj/item/encryptionkey/heads/cmo,
|
||||
/turf/open/floor/pod/light,
|
||||
/area/shuttle/pirate/nri)
|
||||
"CP" = (
|
||||
/obj/machinery/base_alarm/nri_raider{
|
||||
pixel_x = -32
|
||||
@@ -851,6 +841,23 @@
|
||||
/obj/machinery/light/floor,
|
||||
/turf/open/floor/engine/hull/reinforced,
|
||||
/area/shuttle/pirate/nri)
|
||||
"DL" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/closet/crate/secure/weapon{
|
||||
name = "footlocker";
|
||||
desc = "A secure crate to keep all your personal belongings in.";
|
||||
anchored = 1
|
||||
},
|
||||
/obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper,
|
||||
/obj/item/clothing/mask/balaclavaadjust,
|
||||
/obj/item/storage/belt/military/cin_surplus/marine,
|
||||
/obj/item/clothing/head/helmet/nri_police,
|
||||
/obj/item/clothing/suit/armor/vest/nri_police,
|
||||
/obj/item/encryptionkey/heads/hos,
|
||||
/turf/open/floor/pod/light,
|
||||
/area/shuttle/pirate/nri)
|
||||
"Eh" = (
|
||||
/obj/structure/window/reinforced/survival_pod/spawner/directional/east,
|
||||
/obj/machinery/power/smes/engineering,
|
||||
@@ -904,6 +911,32 @@
|
||||
"GO" = (
|
||||
/turf/open/floor/engine/hull,
|
||||
/area/shuttle/pirate/nri)
|
||||
"Hh" = (
|
||||
/obj/structure/rack/shelf,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/item/ammo_box/c310_cargo_box/piercing{
|
||||
pixel_x = 1;
|
||||
pixel_y = 1
|
||||
},
|
||||
/obj/item/ammo_box/c310_cargo_box/piercing{
|
||||
pixel_x = 1;
|
||||
pixel_y = 1
|
||||
},
|
||||
/obj/item/ammo_box/c310_cargo_box/rubber{
|
||||
pixel_x = -1;
|
||||
pixel_y = -1
|
||||
},
|
||||
/obj/item/ammo_box/c310_cargo_box/rubber{
|
||||
pixel_x = -1;
|
||||
pixel_y = -1
|
||||
},
|
||||
/obj/item/ammo_box/c310_cargo_box,
|
||||
/obj/item/ammo_box/c310_cargo_box,
|
||||
/obj/item/ammo_box/magazine/lanca,
|
||||
/obj/item/ammo_box/magazine/lanca,
|
||||
/obj/item/ammo_box/magazine/lanca,
|
||||
/turf/open/floor/pod/light,
|
||||
/area/shuttle/pirate/nri)
|
||||
"Hl" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
@@ -930,23 +963,6 @@
|
||||
"Hz" = (
|
||||
/turf/closed/wall/mineral/titanium/spaceship/nodiagonal,
|
||||
/area/shuttle/pirate/nri)
|
||||
"HD" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/closet/crate/secure/weapon{
|
||||
name = "footlocker";
|
||||
desc = "A secure crate to keep all your personal belongings in.";
|
||||
anchored = 1
|
||||
},
|
||||
/obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper,
|
||||
/obj/item/clothing/mask/balaclavaadjust,
|
||||
/obj/item/storage/belt/military/cin_surplus/marine,
|
||||
/obj/item/clothing/head/helmet/nri_police,
|
||||
/obj/item/clothing/suit/armor/vest/nri_police,
|
||||
/obj/item/encryptionkey/heads/hos,
|
||||
/turf/open/floor/pod/light,
|
||||
/area/shuttle/pirate/nri)
|
||||
"HO" = (
|
||||
/obj/machinery/door/airlock/survival_pod/glass{
|
||||
dir = 1
|
||||
@@ -999,10 +1015,43 @@
|
||||
"IY" = (
|
||||
/turf/open/floor/engine/hull/reinforced,
|
||||
/area/shuttle/pirate/nri)
|
||||
"JB" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/closet/crate/secure/weapon{
|
||||
anchored = 1
|
||||
},
|
||||
/obj/machinery/light/small/red/directional/south,
|
||||
/obj/item/ammo_box/advanced/s12gauge/bean,
|
||||
/obj/item/ammo_box/advanced/s12gauge/bean,
|
||||
/obj/item/ammo_box/advanced/s12gauge/magnum,
|
||||
/obj/item/ammo_box/advanced/s12gauge/express,
|
||||
/turf/open/floor/pod/dark,
|
||||
/area/shuttle/pirate/nri)
|
||||
"JS" = (
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/engine/hull/reinforced,
|
||||
/area/shuttle/pirate/nri)
|
||||
"Kb" = (
|
||||
/obj/machinery/light/small/red/directional/south,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/closet/crate/secure/weapon{
|
||||
name = "footlocker";
|
||||
desc = "A secure crate to keep all your personal belongings in.";
|
||||
anchored = 1
|
||||
},
|
||||
/obj/item/clothing/glasses/hud/health,
|
||||
/obj/item/clothing/glasses/hud/security/sunglasses/peacekeeper,
|
||||
/obj/item/clothing/mask/balaclavaadjust,
|
||||
/obj/item/storage/belt/military/cin_surplus/marine,
|
||||
/obj/item/clothing/head/helmet/nri_police,
|
||||
/obj/item/clothing/suit/armor/vest/nri_police,
|
||||
/obj/item/encryptionkey/heads/cmo,
|
||||
/turf/open/floor/pod/light,
|
||||
/area/shuttle/pirate/nri)
|
||||
"Kc" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 9
|
||||
@@ -1030,26 +1079,6 @@
|
||||
/obj/item/mod/module/holster,
|
||||
/turf/open/floor/pod/dark,
|
||||
/area/shuttle/pirate/nri)
|
||||
"Lx" = (
|
||||
/obj/structure/rack/shelf,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/item/ammo_box/c56mm{
|
||||
pixel_x = 1;
|
||||
pixel_y = 1
|
||||
},
|
||||
/obj/item/ammo_box/c56mm/rubber{
|
||||
pixel_x = -1;
|
||||
pixel_y = -1
|
||||
},
|
||||
/obj/item/ammo_box/c56mm,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/obj/item/ammo_box/magazine/akm/civvie,
|
||||
/turf/open/floor/pod/light,
|
||||
/area/shuttle/pirate/nri)
|
||||
"LA" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/storage/medkit/brute{
|
||||
@@ -1105,20 +1134,6 @@
|
||||
/obj/item/stack/sticky_tape/surgical,
|
||||
/turf/open/floor/pod,
|
||||
/area/shuttle/pirate/nri)
|
||||
"NT" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/closet/crate/secure/weapon{
|
||||
anchored = 1
|
||||
},
|
||||
/obj/machinery/light/small/red/directional/south,
|
||||
/obj/item/ammo_box/c9mm/ap,
|
||||
/obj/item/ammo_box/c9mm,
|
||||
/obj/item/ammo_box/c9mm,
|
||||
/obj/item/ammo_box/c9mm/hp,
|
||||
/turf/open/floor/pod/dark,
|
||||
/area/shuttle/pirate/nri)
|
||||
"NW" = (
|
||||
/obj/machinery/power/shuttle_engine/propulsion/burst{
|
||||
dir = 8
|
||||
@@ -1594,8 +1609,8 @@ yE
|
||||
(11,1,1) = {"
|
||||
Hz
|
||||
Pi
|
||||
rk
|
||||
tN
|
||||
kq
|
||||
uh
|
||||
Hz
|
||||
Iv
|
||||
Iv
|
||||
@@ -1629,7 +1644,7 @@ Hz
|
||||
Hz
|
||||
fB
|
||||
wb
|
||||
NT
|
||||
JB
|
||||
Hz
|
||||
rd
|
||||
pe
|
||||
@@ -1639,12 +1654,12 @@ be
|
||||
Hz
|
||||
Bw
|
||||
wb
|
||||
HD
|
||||
DL
|
||||
Hz
|
||||
"}
|
||||
(14,1,1) = {"
|
||||
Hz
|
||||
Lx
|
||||
Hh
|
||||
wb
|
||||
Ci
|
||||
Hz
|
||||
@@ -1656,14 +1671,14 @@ tk
|
||||
Hz
|
||||
bE
|
||||
wb
|
||||
pt
|
||||
pg
|
||||
Hz
|
||||
"}
|
||||
(15,1,1) = {"
|
||||
Hz
|
||||
rg
|
||||
qp
|
||||
aW
|
||||
ts
|
||||
Hz
|
||||
pQ
|
||||
tl
|
||||
@@ -1673,7 +1688,7 @@ hl
|
||||
Hz
|
||||
TF
|
||||
qp
|
||||
CC
|
||||
Kb
|
||||
Hz
|
||||
"}
|
||||
(16,1,1) = {"
|
||||
|
||||
@@ -15,7 +15,15 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/virtual_domain)
|
||||
"aK" = (
|
||||
/obj/item/gun/energy/laser/plasma_thrower,
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_thrower,
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery{
|
||||
pixel_y = -12;
|
||||
pixel_x = -9
|
||||
},
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery{
|
||||
pixel_y = -14;
|
||||
pixel_x = -2
|
||||
},
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/virtual_domain)
|
||||
"aP" = (
|
||||
@@ -221,7 +229,6 @@
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/computer{
|
||||
dir = 2;
|
||||
name = "hovercraft console";
|
||||
icon_screen = "shuttle";
|
||||
desc = "An armored hovercraft control computer. Doesn't work anymore... who would've thought."
|
||||
@@ -366,8 +373,30 @@
|
||||
/turf/open/misc/dirt/planet,
|
||||
/area/virtual_domain)
|
||||
"kF" = (
|
||||
/obj/item/ammo_box/c980grenade/shrapnel,
|
||||
/turf/open/misc/grass/planet/ancient_milsim,
|
||||
/obj/structure/rack/shelf,
|
||||
/obj/item/ammo_box/advanced/s12gauge/pt20{
|
||||
pixel_y = -7;
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/item/ammo_box/advanced/s12gauge/pt20{
|
||||
pixel_y = -7;
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/item/ammo_box/advanced/s12gauge{
|
||||
pixel_x = 3
|
||||
},
|
||||
/obj/item/ammo_box/advanced/s12gauge{
|
||||
pixel_x = 3
|
||||
},
|
||||
/obj/item/ammo_box/advanced/s12gauge/flechette{
|
||||
pixel_y = 9;
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/item/ammo_box/advanced/s12gauge/flechette{
|
||||
pixel_y = 9;
|
||||
pixel_x = -5
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"kJ" = (
|
||||
/obj/structure/chair/stool/directional/west,
|
||||
@@ -454,8 +483,8 @@
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain/safehouse)
|
||||
"mV" = (
|
||||
/obj/item/ammo_box/c980grenade/shrapnel/phosphor,
|
||||
/turf/open/misc/grass/planet/ancient_milsim,
|
||||
/obj/item/ammo_box/c310_cargo_box/piercing,
|
||||
/turf/open/floor/plating,
|
||||
/area/virtual_domain)
|
||||
"mZ" = (
|
||||
/obj/structure/reagent_dispensers/fueltank,
|
||||
@@ -635,7 +664,17 @@
|
||||
/area/virtual_domain)
|
||||
"td" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/storage/box/utensils,
|
||||
/obj/item/ammo_box/c310_cargo_box/piercing{
|
||||
pixel_y = 9;
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/item/ammo_box/c27_54cesarzowa/rubber{
|
||||
pixel_y = 2;
|
||||
pixel_x = 4
|
||||
},
|
||||
/obj/item/storage/box/utensils{
|
||||
pixel_x = -12
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"te" = (
|
||||
@@ -783,7 +822,26 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/virtual_domain)
|
||||
"wr" = (
|
||||
/obj/item/deployable_turret_folded,
|
||||
/obj/structure/rack/shelf,
|
||||
/obj/item/ammo_box/magazine/wylom{
|
||||
pixel_y = 10;
|
||||
pixel_x = 4
|
||||
},
|
||||
/obj/item/ammo_box/magazine/wylom{
|
||||
pixel_y = 10;
|
||||
pixel_x = -6
|
||||
},
|
||||
/obj/item/ammo_box/magazine/miecz{
|
||||
pixel_y = -3;
|
||||
pixel_x = -5
|
||||
},
|
||||
/obj/item/ammo_box/magazine/miecz{
|
||||
pixel_y = -3
|
||||
},
|
||||
/obj/item/ammo_box/magazine/miecz{
|
||||
pixel_y = -3;
|
||||
pixel_x = 5
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"wv" = (
|
||||
@@ -902,11 +960,6 @@
|
||||
/obj/item/folder/documents,
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/virtual_domain)
|
||||
"Aw" = (
|
||||
/obj/item/ammo_box/advanced/s12gauge,
|
||||
/obj/item/ammo_box/advanced/s12gauge,
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"AB" = (
|
||||
/obj/structure/chair{
|
||||
dir = 8
|
||||
@@ -966,8 +1019,10 @@
|
||||
/turf/open/floor/iron/white,
|
||||
/area/virtual_domain)
|
||||
"Co" = (
|
||||
/obj/item/ammo_box/advanced/s12gauge/pt20,
|
||||
/obj/item/ammo_box/advanced/s12gauge/pt20,
|
||||
/obj/structure/sign/poster/random/directional/west,
|
||||
/obj/item/gun/ballistic/automatic/wylom,
|
||||
/obj/structure/rack/gunrack,
|
||||
/obj/item/gun/ballistic/automatic/miecz,
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"Cr" = (
|
||||
@@ -982,10 +1037,6 @@
|
||||
},
|
||||
/turf/open/misc/grass/planet/ancient_milsim,
|
||||
/area/virtual_domain)
|
||||
"Cz" = (
|
||||
/obj/item/storage/toolbox/ammobox/full/mosin,
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"CH" = (
|
||||
/obj/structure/flippedtable,
|
||||
/obj/structure/closet/crate/freezer/blood,
|
||||
@@ -1032,7 +1083,7 @@
|
||||
/turf/open/floor/iron/smooth_large,
|
||||
/area/virtual_domain)
|
||||
"Dt" = (
|
||||
/obj/item/gun/ballistic/automatic/sol_grenade_launcher/evil/no_mag,
|
||||
/obj/item/gun/ballistic/automatic/wylom,
|
||||
/turf/open/misc/grass/planet/ancient_milsim,
|
||||
/area/virtual_domain)
|
||||
"Dy" = (
|
||||
@@ -1199,8 +1250,16 @@
|
||||
/turf/open/floor/iron/white,
|
||||
/area/virtual_domain)
|
||||
"HL" = (
|
||||
/obj/item/ammo_box/c980grenade/smoke,
|
||||
/turf/open/misc/grass/planet/ancient_milsim,
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/gun/ballistic/automatic/lanca{
|
||||
pixel_y = 6;
|
||||
pixel_x = -2
|
||||
},
|
||||
/obj/item/ammo_box/magazine/lanca{
|
||||
pixel_y = 1;
|
||||
pixel_x = -4
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"HM" = (
|
||||
/obj/machinery/vending/wardrobe/bar_wardrobe,
|
||||
@@ -1361,7 +1420,14 @@
|
||||
/area/virtual_domain)
|
||||
"MW" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/gun/ballistic/rifle/boltaction/sporterized,
|
||||
/obj/item/ammo_box/magazine/lanca{
|
||||
pixel_y = -1;
|
||||
pixel_x = -4
|
||||
},
|
||||
/obj/item/ammo_box/magazine/lanca{
|
||||
pixel_y = 2;
|
||||
pixel_x = 4
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"MY" = (
|
||||
@@ -1450,7 +1516,7 @@
|
||||
/turf/open/misc/grass/planet/ancient_milsim,
|
||||
/area/virtual_domain)
|
||||
"QF" = (
|
||||
/obj/item/ammo_box/c40sol,
|
||||
/obj/item/ammo_box/magazine/lanca,
|
||||
/turf/open/floor/plating,
|
||||
/area/virtual_domain)
|
||||
"QV" = (
|
||||
@@ -1536,12 +1602,8 @@
|
||||
/turf/open/floor/iron/dark,
|
||||
/area/virtual_domain)
|
||||
"SJ" = (
|
||||
/obj/item/gun/ballistic/shotgun/automatic/combat/compact,
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"SV" = (
|
||||
/obj/item/ammo_box/advanced/s12gauge/flechette,
|
||||
/obj/item/ammo_box/advanced/s12gauge/flechette,
|
||||
/obj/structure/rack/shelf,
|
||||
/obj/item/gun/ballistic/revolver/shotgun_revolver,
|
||||
/turf/open/floor/iron,
|
||||
/area/virtual_domain)
|
||||
"Td" = (
|
||||
@@ -1638,7 +1700,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/virtual_domain)
|
||||
"Vr" = (
|
||||
/obj/item/ammo_box/magazine/c980_grenade/starts_empty,
|
||||
/obj/item/ammo_box/magazine/wylom,
|
||||
/turf/open/misc/grass/planet/ancient_milsim,
|
||||
/area/virtual_domain)
|
||||
"VA" = (
|
||||
@@ -1690,7 +1752,7 @@
|
||||
/turf/open/floor/iron/smooth,
|
||||
/area/virtual_domain)
|
||||
"WY" = (
|
||||
/obj/item/gun/ballistic/rifle/boltaction/sporterized,
|
||||
/obj/item/gun/ballistic/automatic/lanca,
|
||||
/turf/open/floor/plating,
|
||||
/area/virtual_domain)
|
||||
"Xh" = (
|
||||
@@ -2659,14 +2721,14 @@ Cd
|
||||
Wr
|
||||
hj
|
||||
rB
|
||||
YY
|
||||
SJ
|
||||
UQ
|
||||
Pw
|
||||
De
|
||||
YY
|
||||
DW
|
||||
wr
|
||||
De
|
||||
Co
|
||||
ob
|
||||
uZ
|
||||
jS
|
||||
@@ -2717,9 +2779,9 @@ Cd
|
||||
hj
|
||||
hj
|
||||
rB
|
||||
Co
|
||||
Aw
|
||||
SV
|
||||
YY
|
||||
YY
|
||||
YY
|
||||
YY
|
||||
YY
|
||||
YY
|
||||
@@ -2775,8 +2837,8 @@ Hq
|
||||
hj
|
||||
hj
|
||||
rB
|
||||
kF
|
||||
YY
|
||||
SJ
|
||||
tg
|
||||
YY
|
||||
YY
|
||||
@@ -3016,7 +3078,7 @@ dd
|
||||
AB
|
||||
DW
|
||||
et
|
||||
td
|
||||
HL
|
||||
YY
|
||||
HM
|
||||
dd
|
||||
@@ -3131,8 +3193,8 @@ iI
|
||||
dd
|
||||
mu
|
||||
te
|
||||
Cz
|
||||
Cz
|
||||
YY
|
||||
YY
|
||||
ZQ
|
||||
mu
|
||||
dd
|
||||
@@ -3814,7 +3876,7 @@ dd
|
||||
dd
|
||||
yl
|
||||
Is
|
||||
kX
|
||||
mV
|
||||
dd
|
||||
OV
|
||||
kX
|
||||
@@ -4370,7 +4432,7 @@ Uz
|
||||
"}
|
||||
(46,1,1) = {"
|
||||
Uz
|
||||
mV
|
||||
Cd
|
||||
bB
|
||||
bB
|
||||
ki
|
||||
@@ -4488,7 +4550,7 @@ Uz
|
||||
Uz
|
||||
Dt
|
||||
Vr
|
||||
kF
|
||||
Cd
|
||||
Cd
|
||||
Cd
|
||||
Cd
|
||||
@@ -4544,7 +4606,7 @@ Uz
|
||||
"}
|
||||
(49,1,1) = {"
|
||||
Uz
|
||||
HL
|
||||
Cd
|
||||
Vr
|
||||
Cd
|
||||
Cd
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#define COMPANY_ALLSTAR "It has <b>[span_red("Allstar Lasers Inc.")]</b> stamped onto it."
|
||||
#define COMPANY_MICRON "It has <b>[span_cyan("Micron Control Sys.")]</b> cut into it."
|
||||
|
||||
#define COMPANY_IZHEVSK "It has <b>[span_brown("Izhevsk Coalition")]</b> cut into it."
|
||||
#define COMPANY_SZOT "It has a small <b>[span_engradio("three point crown")]</b> alongside <b>[span_engradio("Szot Dynamica")]</b> cut into it."
|
||||
#define COMPANY_TKACH "It has <b>[span_robot("Tkach Design Bureau")]</b> stamped onto it."
|
||||
#define COMPANY_SAKHNO "It has <b>[span_green("Sakhno Concern")]</b> stamped onto it."
|
||||
#define COMPANY_XHIHAO "It has <b>[span_purple("Xhihao Light Arms")]</b> etched into it."
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
/// The caliber used by the AK-25
|
||||
#define CALIBER_732x29 "a732x29"
|
||||
|
||||
/// The caliber used by the Oldarms 'Mk.11.4 rifle', designed to be worse .223.
|
||||
#define CALIBER_223S ".223 Stinger"
|
||||
|
||||
/// Caliber used by the giant anti materiel rifle in guncargo
|
||||
#define CALIBER_60STRELA ".60 Strela"
|
||||
|
||||
/// CIN pistol caliber
|
||||
#define CALIBER_CESARZOWA ".27-54 Cesarzowa"
|
||||
|
||||
/// Standard Sol rifle caliber
|
||||
#define CALIBER_SOL40LONG ".40 Sol Long"
|
||||
/// Standard Sol pistol caliber
|
||||
|
||||
@@ -26,15 +26,15 @@
|
||||
melee_damage_lower = 5
|
||||
melee_damage_upper = 10
|
||||
ai_controller = /datum/ai_controller/basic_controller/trooper/ranged
|
||||
r_hand = /obj/item/gun/ballistic/automatic/nri_smg
|
||||
r_hand = /obj/item/gun/ballistic/automatic/miecz
|
||||
/// Type of bullet we use
|
||||
var/casingtype = /obj/item/ammo_casing/c9mm
|
||||
var/casingtype = /obj/item/ammo_casing/c27_54cesarzowa
|
||||
/// Sound to play when firing weapon
|
||||
var/projectilesound = 'sound/weapons/gun/smg/shot_alt.ogg'
|
||||
var/projectilesound = 'modular_skyrat/modules/modular_weapons/sounds/smg_light.ogg'
|
||||
/// number of burst shots
|
||||
var/burst_shots = 2
|
||||
var/burst_shots = 1
|
||||
/// Time between taking shots
|
||||
var/ranged_cooldown = 1.5 SECONDS
|
||||
var/ranged_cooldown = 0.3 SECONDS
|
||||
|
||||
/mob/living/basic/trooper/cin_soldier/ranged/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
@@ -52,8 +52,8 @@
|
||||
back = /obj/item/storage/backpack/industrial/cin_surplus/forest
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/nri_survival_pack/raider,
|
||||
/obj/item/gun/ballistic/automatic/pistol/clandestine,
|
||||
/obj/item/ammo_box/magazine/m10mm = 2,
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_marksman,
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery = 2,
|
||||
)
|
||||
r_hand = null
|
||||
l_hand = null
|
||||
|
||||
+38
-20
@@ -8,20 +8,15 @@
|
||||
subcategory = "Clothing Supplies"
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/clothing/uniform
|
||||
description = "A CIN designed combat uniform that can come in any number of camouflauge variations. These will ship in a station environment suitable camouflauge scheme."
|
||||
item_type = /obj/item/clothing/under/syndicate/rus_army/cin_surplus
|
||||
item_type = /obj/item/clothing/under/syndicate/rus_army/cin_surplus/random_color
|
||||
cost = PAYCHECK_CREW
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/clothing/cap
|
||||
item_type = /obj/item/clothing/head/soft/nri_larp
|
||||
cost = PAYCHECK_LOWER
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/clothing/belt
|
||||
item_type = /obj/item/storage/belt/military/cin_surplus
|
||||
item_type = /obj/item/storage/belt/military/cin_surplus/random_color
|
||||
cost = PAYCHECK_CREW
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/clothing/backpack
|
||||
item_type = /obj/item/storage/backpack/industrial/cin_surplus
|
||||
item_type = /obj/item/storage/backpack/industrial/cin_surplus/random_color
|
||||
cost = PAYCHECK_CREW
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/clothing/gas_mask
|
||||
@@ -29,12 +24,10 @@
|
||||
cost = PAYCHECK_CREW
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/clothing/helmet
|
||||
description = "A service helmet primarily used by CIN military forces. These will ship in a station environment suitable camouflauge scheme."
|
||||
item_type = /obj/item/clothing/head/helmet/cin_surplus_helmet
|
||||
item_type = /obj/item/clothing/head/helmet/cin_surplus_helmet/random_color
|
||||
cost = PAYCHECK_COMMAND
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/clothing/vest
|
||||
description = "An armor vest primarily used by CIN military forces. These will ship in a station environment suitable camouflauge scheme."
|
||||
item_type = /obj/item/clothing/suit/armor/vest/cin_surplus_vest
|
||||
cost = PAYCHECK_COMMAND
|
||||
|
||||
@@ -104,30 +97,55 @@
|
||||
subcategory = "Firearms"
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm/shotgun_revolver
|
||||
item_type = /obj/item/gun/ballistic/revolver/cin_shotgun_revolver
|
||||
item_type = /obj/item/gun/ballistic/revolver/shotgun_revolver
|
||||
cost = PAYCHECK_COMMAND * 6
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm/plasma_thrower
|
||||
item_type = /obj/item/gun/energy/laser/plasma_thrower
|
||||
item_type = /obj/item/gun/ballistic/automatic/pistol/plasma_thrower
|
||||
cost = PAYCHECK_COMMAND * 6
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm/anti_materiel_rifle
|
||||
item_type = /obj/item/gun/ballistic/automatic/cin_amr
|
||||
cost = PAYCHECK_COMMAND * 12
|
||||
restricted = TRUE
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm/plasma_marksman
|
||||
item_type = /obj/item/gun/ballistic/automatic/pistol/plasma_marksman
|
||||
cost = PAYCHECK_COMMAND * 6
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm/miecz
|
||||
item_type = /obj/item/gun/ballistic/automatic/miecz
|
||||
cost = PAYCHECK_COMMAND * 10
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm/sakhno_rifle
|
||||
item_type = /obj/item/gun/ballistic/rifle/boltaction
|
||||
cost = PAYCHECK_COMMAND * 12
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm/lanca
|
||||
item_type = /obj/item/gun/ballistic/automatic/lanca
|
||||
contraband = TRUE
|
||||
cost = PAYCHECK_COMMAND * 14
|
||||
restricted = TRUE
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm/anti_materiel_rifle
|
||||
item_type = /obj/item/gun/ballistic/automatic/wylom
|
||||
contraband = TRUE
|
||||
cost = PAYCHECK_COMMAND * 16
|
||||
restricted = TRUE
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm_ammo
|
||||
subcategory = "Firearm Magazines"
|
||||
cost = PAYCHECK_CREW
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm_ammo/amr_magazine
|
||||
item_type = /obj/item/ammo_box/magazine/cin_amr
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm_ammo/plasma_battery
|
||||
item_type = /obj/item/ammo_box/magazine/recharge/plasma_battery
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm_ammo/sakhno_stripper
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm_ammo/miecz
|
||||
item_type = /obj/item/ammo_box/magazine/miecz/spawns_empty
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm_ammo/sakhno
|
||||
item_type = /obj/item/ammo_box/strilka310
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm_ammo/lanca
|
||||
item_type = /obj/item/ammo_box/magazine/lanca/spawns_empty
|
||||
contraband = TRUE
|
||||
|
||||
/datum/armament_entry/company_import/nri_surplus/firearm_ammo/amr_magazine
|
||||
item_type = /obj/item/ammo_box/magazine/wylom
|
||||
contraband = TRUE
|
||||
cost = PAYCHECK_CREW * 3
|
||||
|
||||
@@ -60,20 +60,20 @@
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/auto10mm_rubber
|
||||
item_type = /obj/item/ammo_box/c10mm/rubber
|
||||
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/sabel_lethal
|
||||
item_type = /obj/item/ammo_box/c56mm
|
||||
cost = PAYCHECK_COMMAND
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/strilka_lethal
|
||||
item_type = /obj/item/ammo_box/c310_cargo_box
|
||||
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/sabel_rubber
|
||||
item_type = /obj/item/ammo_box/c56mm/rubber
|
||||
cost = PAYCHECK_COMMAND
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/strilka_rubber
|
||||
item_type = /obj/item/ammo_box/c310_cargo_box/rubber
|
||||
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/sabel_hunting
|
||||
item_type = /obj/item/ammo_box/c56mm/hunting
|
||||
cost = PAYCHECK_COMMAND
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/strilka_ap
|
||||
item_type = /obj/item/ammo_box/c310_cargo_box/piercing
|
||||
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/sabel_blank
|
||||
item_type = /obj/item/ammo_box/c56mm/blank
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/cesarzowa_lethal
|
||||
item_type = /obj/item/ammo_box/c27_54cesarzowa
|
||||
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/cesarzowa_rubber
|
||||
item_type = /obj/item/ammo_box/c27_54cesarzowa/rubber
|
||||
|
||||
/datum/armament_entry/company_import/vitezstvi/ammo_boxes/sol35
|
||||
item_type = /obj/item/ammo_box/c35sol
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
/obj/item/gun/ballistic/automatic/ak25
|
||||
name = "\improper AK-25 rifle"
|
||||
desc = "A cheap reproduction of the timeless AK rifle. The price tag is lower than usual, but expect it to blow up in your hands."
|
||||
icon = 'modular_skyrat/modules/company_imports/icons/ak25/ak25.dmi'
|
||||
icon_state = "ak25"
|
||||
lefthand_file = 'modular_skyrat/modules/company_imports/icons/ak25/ak25_lefthand.dmi'
|
||||
righthand_file = 'modular_skyrat/modules/company_imports/icons/ak25/ak25_righthand.dmi'
|
||||
inhand_icon_state = "ak25"
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
weapon_weight = WEAPON_HEAVY
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/ak25
|
||||
can_suppress = FALSE
|
||||
burst_size = 3
|
||||
fire_delay = 2
|
||||
worn_icon = 'modular_skyrat/modules/company_imports/icons/ak25/ak25_back.dmi'
|
||||
worn_icon_state = "ak25"
|
||||
fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/akm_fire.ogg'
|
||||
rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_cock.ogg'
|
||||
load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magin.ogg'
|
||||
load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magin.ogg'
|
||||
eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magout.ogg'
|
||||
alt_icons = TRUE
|
||||
spread = 29
|
||||
recoil = 0.1
|
||||
|
||||
/obj/item/gun/ballistic/automatic/ak25/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_IZHEVSK)
|
||||
|
||||
/obj/item/ammo_box/magazine/ak25
|
||||
name = "\improper AK-25 magazine"
|
||||
desc = "A banana-shaped double-stack magazine able to hold 30 rounds of 7.32x29mm ammunition."
|
||||
icon = 'modular_skyrat/modules/company_imports/icons/ak25/ak25_ammo.dmi'
|
||||
icon_state = "ak25_mag"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a732x29
|
||||
caliber = CALIBER_732x29
|
||||
max_ammo = 30
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
|
||||
/obj/item/ammo_casing/realistic/a732x29
|
||||
name = "7.32x29 bullet casing"
|
||||
desc = "A 7.32x29mm M43 bullet casing."
|
||||
icon_state = "762x39-casing"
|
||||
caliber = CALIBER_732x29
|
||||
projectile_type = /obj/projectile/bullet/a732x29
|
||||
|
||||
/obj/projectile/bullet/a732x29
|
||||
name = "7.62x25 bullet"
|
||||
damage = 22
|
||||
@@ -1,3 +0,0 @@
|
||||
/obj/item/clothing/head/soft/nri_larp
|
||||
name = "imperial field cap"
|
||||
desc = "A stiff military soft cap often seen worn by members of the NRI's military forces, or people like you."
|
||||
@@ -74,36 +74,6 @@
|
||||
name = "ammo box (.34 incendiary)"
|
||||
ammo_type = /obj/item/ammo_casing/c34_incendiary
|
||||
|
||||
/obj/item/ammo_box/c56mm
|
||||
name = "ammo box (5.6mm civilian)"
|
||||
desc = "5.6x40mm ammunition specifically made for civilian use like recreation, hunting, self-defense or LARP. While the package itself lacks any real identification \
|
||||
and does, in fact, appear like a bland green box with a colored stripe, the insides have a boatload of information, \
|
||||
ranging from manufacturer advertisements and intended use to the cartridge's tactical and technical characteristics."
|
||||
icon = 'modular_skyrat/modules/novaya_ert/icons/ammo_boxes.dmi'
|
||||
icon_state = "boxnrifle-lethal"
|
||||
base_icon_state = "boxnrifle-lethal"
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/civilian
|
||||
max_ammo = 60
|
||||
|
||||
/obj/item/ammo_box/c56mm/rubber
|
||||
name = "ammo box (5.6mm rubber)"
|
||||
icon_state = "boxnrifle-rubber"
|
||||
base_icon_state = "boxnrifle-rubber"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/civilian/rubber
|
||||
|
||||
/obj/item/ammo_box/c56mm/hunting
|
||||
name = "ammo box (5.6mm hunting)"
|
||||
icon_state = "boxnrifle-hunting"
|
||||
base_icon_state = "boxnrifle-hunting"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/civilian/hunting
|
||||
|
||||
/obj/item/ammo_box/c56mm/blank
|
||||
name = "ammo box (5.6mm blank)"
|
||||
icon_state = "boxnrifle-blank"
|
||||
base_icon_state = "boxnrifle-blank"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/civilian/blank
|
||||
|
||||
/obj/item/storage/box/ammo_box/microfusion/bluespace
|
||||
name = "bluespace microfusion cell container"
|
||||
desc = "A box filled with microfusion cells."
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 431 B |
Binary file not shown.
|
Before Width: | Height: | Size: 777 B |
Binary file not shown.
|
Before Width: | Height: | Size: 769 B |
Binary file not shown.
|
Before Width: | Height: | Size: 765 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB |
@@ -132,8 +132,8 @@ GLOBAL_VAR(first_officer)
|
||||
back = /obj/item/storage/backpack/satchel/leather
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/nri_survival_pack/raider = 1,
|
||||
/obj/item/ammo_box/magazine/m9mm_aps = 3,
|
||||
/obj/item/gun/ballistic/automatic/pistol/nri = 1,
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery = 3,
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_marksman = 1,
|
||||
/obj/item/crucifix = 1,
|
||||
/obj/item/clothing/mask/gas/nri_police = 1,
|
||||
/obj/item/modular_computer/pda/nri_police = 1,
|
||||
|
||||
@@ -186,15 +186,12 @@
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/ammo_box/magazine/c35sol_pistol/stendo(src)
|
||||
new /obj/item/ammo_box/magazine/c35sol_pistol/stendo(src)
|
||||
new /obj/item/gun/ballistic/automatic/akm(src)
|
||||
new /obj/item/gun/ballistic/automatic/lanca(src)
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/ammo_box/magazine/akm(src)
|
||||
new /obj/item/gun/ballistic/automatic/ppsh(src)
|
||||
new /obj/item/ammo_box/magazine/lanca(src)
|
||||
new /obj/item/gun/ballistic/automatic/miecz(src)
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/ammo_box/magazine/ppsh(src)
|
||||
new /obj/item/gun/ballistic/automatic/stg(src)
|
||||
for(var/i in 1 to 2)
|
||||
new /obj/item/ammo_box/magazine/stg(src)
|
||||
new /obj/item/ammo_box/magazine/miecz(src)
|
||||
|
||||
if(4) //MODsuits
|
||||
new /obj/item/mod/control/pre_equipped/mining(src)
|
||||
|
||||
@@ -49,168 +49,3 @@
|
||||
damage = 20
|
||||
wound_falloff_tile = 0
|
||||
//
|
||||
|
||||
//NRI Propietary ammo
|
||||
/obj/item/ammo_casing/realistic/a762x39
|
||||
name = "5.6x40mm bullet casing"
|
||||
desc = "A 5.6x40mm bullet casing."
|
||||
icon_state = "762x39-casing"
|
||||
caliber = "a762x39"
|
||||
projectile_type = /obj/projectile/bullet/a762x39
|
||||
|
||||
/obj/projectile/bullet/a762x39
|
||||
name = "5.6mm bullet"
|
||||
damage = 38
|
||||
wound_bonus = 35
|
||||
armour_penetration = 40
|
||||
wound_falloff_tile = 0
|
||||
|
||||
/obj/item/ammo_casing/realistic/a762x39/ricochet
|
||||
name = "5.6x40mm match bullet casing"
|
||||
desc = "A 5.6x40mm match bullet casing."
|
||||
special_desc = "MATCH: Ricochets everywhere. Like crazy."
|
||||
projectile_type = /obj/projectile/bullet/a762x39/ricochet
|
||||
advanced_print_req = TRUE
|
||||
|
||||
/obj/projectile/bullet/a762x39/ricochet
|
||||
name = "5.6mm match bullet"
|
||||
damage = 30
|
||||
wound_bonus = 25
|
||||
armour_penetration = 25
|
||||
ricochets_max = 2
|
||||
ricochet_chance = 100
|
||||
ricochet_auto_aim_angle = 30
|
||||
ricochet_auto_aim_range = 15
|
||||
ricochet_incidence_leeway = 40
|
||||
ricochet_decay_damage = 1
|
||||
ricochet_shoots_firer = FALSE
|
||||
|
||||
/obj/item/ammo_casing/realistic/a762x39/fire
|
||||
name = "5.6x40mm incendiary bullet casing"
|
||||
desc = "A 5.6x40mm incendiary bullet casing."
|
||||
special_desc = "TARGETED INCENDIARY: Leaves no trail when shot, sets targets aflame."
|
||||
projectile_type = /obj/projectile/bullet/incendiary/a762x39
|
||||
custom_materials = AMMO_MATS_TEMP
|
||||
advanced_print_req = TRUE
|
||||
|
||||
/obj/projectile/bullet/incendiary/a762x39
|
||||
name = "5.6mm incendiary bullet"
|
||||
damage = 30
|
||||
wound_bonus = 25
|
||||
armour_penetration = 30
|
||||
wound_falloff_tile = -5
|
||||
fire_stacks = 2
|
||||
leaves_fire_trail = FALSE
|
||||
|
||||
/obj/item/ammo_casing/realistic/a762x39/ap
|
||||
name = "5.6x40mm armor-piercing bullet casing"
|
||||
desc = "A 5.6x40mm armor-piercing bullet casing."
|
||||
special_desc = "ARMOR PIERCING: Increased armor piercing capabilities. What did you expect?"
|
||||
projectile_type = /obj/projectile/bullet/a762x39
|
||||
custom_materials = AMMO_MATS_AP
|
||||
advanced_print_req = TRUE
|
||||
|
||||
/obj/projectile/bullet/a762x39/ap
|
||||
name = "5.6mm armor-piercing bullet"
|
||||
damage = 30
|
||||
wound_bonus = 15
|
||||
armour_penetration = 60
|
||||
|
||||
/obj/item/ammo_casing/realistic/a762x39/emp
|
||||
name = "5.6x40mm ion bullet casing"
|
||||
desc = "A 5.6x40mm ion bullet casing."
|
||||
special_desc = "EMP: Produces an Electro-Magnetic Pulse on impact, damaging electronics severely."
|
||||
custom_materials = AMMO_MATS_EMP
|
||||
projectile_type = /obj/projectile/bullet/a762x39/emp
|
||||
|
||||
/obj/projectile/bullet/a762x39/emp
|
||||
name = "5.6mm ion bullet"
|
||||
damage = 25
|
||||
wound_bonus = 15
|
||||
armour_penetration = 15
|
||||
var/heavy_emp_radius = -1
|
||||
var/light_emp_radius = 0
|
||||
|
||||
/obj/projectile/bullet/a762x39/emp/on_hit(atom/target, blocked = 0, pierce_hit)
|
||||
..()
|
||||
empulse(target, heavy_emp_radius, light_emp_radius)
|
||||
return BULLET_ACT_HIT
|
||||
|
||||
/obj/item/ammo_casing/realistic/a762x39/civilian
|
||||
name = "5.6x40mm civilian bullet casing"
|
||||
desc = "A 5.6x40mm civilian-grade surplus bullet casing."
|
||||
special_desc = "CIVILIAN: Non-military ammunition with a low powder load. Performs worse in every aspect in comparison to its military variant."
|
||||
projectile_type = /obj/projectile/bullet/a762x39/civilian
|
||||
|
||||
/obj/projectile/bullet/a762x39/civilian
|
||||
name = "5.6mm civilian bullet"
|
||||
damage = 34
|
||||
wound_bonus = 15
|
||||
armour_penetration = 10
|
||||
wound_falloff_tile = 3
|
||||
|
||||
/obj/item/ammo_casing/realistic/a762x39/civilian/rubber
|
||||
name = "5.6x40mm rubber bullet casing"
|
||||
desc = "A 5.6x40mm civilian-grade rubber bullet casing."
|
||||
special_desc = "RUBBER: Less than lethal ammo. Deals both stamina and brute damage."
|
||||
projectile_type = /obj/projectile/bullet/a762x39/rubber
|
||||
harmful = FALSE
|
||||
|
||||
/obj/projectile/bullet/a762x39/rubber
|
||||
name = "5.6mm rubber bullet"
|
||||
damage = 15
|
||||
armour_penetration = 10
|
||||
stamina = 45
|
||||
ricochets_max = 6
|
||||
ricochet_incidence_leeway = 0
|
||||
ricochet_chance = 130
|
||||
ricochet_decay_damage = 0.7
|
||||
shrapnel_type = null
|
||||
sharpness = NONE
|
||||
embedding = null
|
||||
wound_bonus = -50
|
||||
|
||||
/obj/item/ammo_casing/realistic/a762x39/civilian/hunting
|
||||
name = "5.6x40mm hunting bullet casing"
|
||||
desc = "A 5.6x40mm jacketed soft point bullet casing."
|
||||
special_desc = "HUNTING: Ammo purpose-built to deal more damage against simplemobs than other humans."
|
||||
projectile_type = /obj/projectile/bullet/a762x39/hunting
|
||||
|
||||
/obj/projectile/bullet/a762x39/hunting
|
||||
name = "5.6mm hunting bullet"
|
||||
damage = 20
|
||||
wound_bonus = 10
|
||||
armour_penetration = 0
|
||||
wound_falloff_tile = 3
|
||||
/// Bonus force dealt against certain mobs
|
||||
var/nemesis_bonus_force = 30
|
||||
/// List (not really a list) of mobs we deal bonus damage to
|
||||
var/list/nemesis_path = /mob/living/simple_animal
|
||||
|
||||
/obj/projectile/bullet/a762x39/hunting/prehit_pierce(mob/living/target, mob/living/carbon/human/user)
|
||||
if(istype(target, nemesis_path))
|
||||
damage += nemesis_bonus_force
|
||||
.=..()
|
||||
|
||||
/obj/item/ammo_casing/realistic/a762x39/civilian/blank
|
||||
name = "5.6x40mm blank bullet casing"
|
||||
desc = "A 5.6x40mm blank bullet casing."
|
||||
special_desc = "BLANK: Projectile-less ammunition that is usually employed in training exercises or Live-Action Roleplay. Potentially harmful."
|
||||
projectile_type = /obj/projectile/bullet/a762x39/blank
|
||||
///"Potentially."
|
||||
harmful = FALSE
|
||||
|
||||
/obj/projectile/bullet/a762x39/blank
|
||||
name = "hot gas"
|
||||
icon = 'icons/obj/weapons/guns/projectiles_muzzle.dmi'
|
||||
icon_state = "muzzle_bullet"
|
||||
damage = 5
|
||||
damage_type = BURN
|
||||
wound_bonus = -100
|
||||
armour_penetration = 0
|
||||
wound_falloff_tile = 15
|
||||
weak_against_armour = TRUE
|
||||
range = 0.01
|
||||
shrapnel_type = null
|
||||
sharpness = NONE
|
||||
embedding = null
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
/obj/item/gun/ballistic/automatic/akm
|
||||
name = "\improper Krinkov carbine"
|
||||
desc = "A timeless human design of a carbine chambered in the NRI's 5.6mm ammo. A weapon so simple that even a child could use it - and they often did."
|
||||
icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
|
||||
icon_state = "akm"
|
||||
lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
|
||||
righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
|
||||
inhand_icon_state = "akm"
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
weapon_weight = WEAPON_HEAVY
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/akm
|
||||
can_suppress = FALSE
|
||||
fire_delay = 2
|
||||
actions_types = list()
|
||||
worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
|
||||
worn_icon_state = "akm"
|
||||
fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/akm_fire.ogg'
|
||||
rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_cock.ogg'
|
||||
load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magin.ogg'
|
||||
load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magin.ogg'
|
||||
eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/ltrifle_magout.ogg'
|
||||
alt_icons = TRUE
|
||||
|
||||
/obj/item/gun/ballistic/automatic/akm/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
AddComponent(/datum/component/automatic_fire, fire_delay)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/akm/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_IZHEVSK)
|
||||
|
||||
/obj/item/ammo_box/magazine/akm
|
||||
name = "\improper Krinkov magazine"
|
||||
desc = "a banana-shaped double-stack magazine able to hold 30 rounds of 5.6mm ammo. It's said that in the early days of SolFed's spread, Spanish colony rebels often referred to these as 'Goat Horns'."
|
||||
icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
|
||||
icon_state = "akm"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39
|
||||
caliber = "a762x39"
|
||||
max_ammo = 30
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
|
||||
/obj/item/ammo_box/magazine/akm/ricochet
|
||||
name = "krinkov magazine (MATCH)"
|
||||
desc = "a banana-shaped double-stack magazine able to hold 30 rounds of 5.6mm ammo. It's said that in the early days of SolFed's spread, Spanish colony rebels often referred to these as 'Goat Horns'. Contains highly ricocheting ammunition."
|
||||
icon_state = "akm_ricochet"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/ricochet
|
||||
|
||||
/obj/item/ammo_box/magazine/akm/fire
|
||||
name = "krinkov magazine (INCENDIARY)"
|
||||
desc = "a banana-shaped double-stack magazine able to hold 30 rounds of 5.6mm ammo. It's said that in the early days of SolFed's spread, Spanish colony rebels often referred to these as 'Goat Horns'. Contains incendiary ammunition."
|
||||
icon_state = "akm_fire"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/fire
|
||||
|
||||
/obj/item/ammo_box/magazine/akm/ap
|
||||
name = "krinkov magazine (ARMOR PIERCING)"
|
||||
desc = "a banana-shaped double-stack magazine able to hold 30 rounds of 5.6mm ammo. It's said that in the early days of SolFed's spread, Spanish colony rebels often referred to these as 'Goat Horns'. Contains armor-piercing ammunition."
|
||||
icon_state = "akm_ap"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/ap
|
||||
|
||||
/obj/item/ammo_box/magazine/akm/emp
|
||||
name = "krinkov magazine (EMP)"
|
||||
desc = "a banana-shaped double-stack magazine able to hold 30 rounds of 5.6mm ammo. It's said that in the early days of SolFed's spread, Spanish colony rebels often referred to these as 'Goat Horns'. Contains ion ammunition, good for disrupting electronics and wrecking mechas."
|
||||
icon_state = "akm_emp"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/emp
|
||||
|
||||
/obj/item/ammo_box/magazine/akm/rubber
|
||||
name = "krinkov magazine (RUBBER)"
|
||||
desc = "a banana-shaped double-stack magazine able to hold 30 rounds of 5.6mm ammo. It's said that in the early days of SolFed's spread, Spanish colony rebels often referred to these as 'Goat Horns'. Contains less-than-lethal rubber ammunition."
|
||||
icon_state = "akm_rubber"
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/civilian/rubber
|
||||
|
||||
/obj/item/ammo_box/magazine/akm/banana
|
||||
name = "\improper Krinkov extended magazine"
|
||||
desc = "a banana-shaped double-stack magazine able to hold 45 rounds of 5.6x40mm ammunition. It's meant to be used on a light machine gun, but it's just a longer Krinkov magazine."
|
||||
max_ammo = 45
|
||||
|
||||
/obj/item/ammo_box/magazine/akm/civvie
|
||||
name = "\improper Sabel magazine"
|
||||
desc = "a shortened double-stack magazine able to hold 15 rounds of civilian-grade 5.6mm ammo."
|
||||
icon_state = "akm_civ"
|
||||
max_ammo = 15
|
||||
ammo_type = /obj/item/ammo_casing/realistic/a762x39/civilian
|
||||
|
||||
/obj/item/gun/ballistic/automatic/akm/modern
|
||||
name = "\improper Bubba's Krinkov"
|
||||
desc = "A modified version of the most iconic human firearm ever made. Most of the original parts are gone in favor of aftermarket replacements."
|
||||
icon_state = "akm_modern"
|
||||
inhand_icon_state = "akm"
|
||||
worn_icon_state = "akm"
|
||||
fire_delay = 1
|
||||
|
||||
/obj/item/gun/ballistic/automatic/akm/civvie
|
||||
name = "\improper Sabel-42 carbine"
|
||||
desc = "A timeless human design of a carbine chambered in the NRI's 5.6mm ammo. The internal modifications made to the firearm in order to accommodate for non-military use made it incompatible with conventional munitions and gave it the inability to fire fully automatic. It's purpose-built to fire low-grade civilian ammo, anything stronger would obliterate the rifling and render the firearm useless."
|
||||
icon_state = "akm_civ"
|
||||
inhand_icon_state = "akm_civ"
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/akm/civvie
|
||||
fire_delay = 5
|
||||
dual_wield_spread = 15
|
||||
spread = 5
|
||||
worn_icon_state = "akm_civ"
|
||||
recoil = 0.2
|
||||
|
||||
/obj/item/gun/ballistic/automatic/akm/nri
|
||||
name = "\improper KV-62 carbine"
|
||||
desc = "A modified version of the most iconic human firearm ever made, re-engineered for better weight, handling, and accuracy, chambered in the NRI's 5.6mm ammo. 'НРИ - Оборонная Коллегия' is etched on the bolt."
|
||||
icon_state = "akm_nri"
|
||||
inhand_icon_state = "akm_nri"
|
||||
worn_icon_state = "akm_nri"
|
||||
can_suppress = TRUE
|
||||
@@ -82,10 +82,6 @@
|
||||
. = ..()
|
||||
new /obj/item/gun/ballistic/automatic/fg42(src)
|
||||
new /obj/item/ammo_box/magazine/fg42(src)
|
||||
new /obj/item/gun/ballistic/automatic/akm(src)
|
||||
new /obj/item/ammo_box/magazine/akm(src)
|
||||
new /obj/item/gun/ballistic/automatic/m16(src)
|
||||
new /obj/item/ammo_box/magazine/m16/vintage(src)
|
||||
new /obj/item/gun/ballistic/automatic/mg34(src)
|
||||
new /obj/item/ammo_box/magazine/mg34(src)
|
||||
new /obj/item/gun/ballistic/automatic/mp40(src)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1022 B After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 8.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 5.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 15 KiB |
@@ -11,10 +11,10 @@
|
||||
/obj/structure/closet/freighterammo/PopulateContents()
|
||||
. = ..()
|
||||
|
||||
new /obj/item/ammo_box/magazine/akm(src)
|
||||
new /obj/item/ammo_box/magazine/akm(src)
|
||||
new /obj/item/ammo_box/magazine/akm(src)
|
||||
new /obj/item/ammo_box/magazine/akm(src)
|
||||
new /obj/item/ammo_box/magazine/lanca(src)
|
||||
new /obj/item/ammo_box/magazine/lanca(src)
|
||||
new /obj/item/ammo_box/magazine/lanca(src)
|
||||
new /obj/item/ammo_box/magazine/lanca(src)
|
||||
new /obj/item/ammo_box/magazine/c35sol_pistol(src)
|
||||
new /obj/item/ammo_box/magazine/c35sol_pistol(src)
|
||||
new /obj/item/ammo_box/strilka310(src)
|
||||
|
||||
+66
@@ -0,0 +1,66 @@
|
||||
// .27-54 Cesarzowa
|
||||
// Small caliber pistol round meant to be fired out of something that shoots real quick like
|
||||
|
||||
/obj/item/ammo_casing/c27_54cesarzowa
|
||||
name = ".27-54 Cesarzowa piercing bullet casing"
|
||||
desc = "A purple-bodied caseless cartridge home to a small projectile with a fine point."
|
||||
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
|
||||
icon_state = "27-54cesarzowa"
|
||||
|
||||
caliber = CALIBER_CESARZOWA
|
||||
projectile_type = /obj/projectile/bullet/c27_54cesarzowa
|
||||
|
||||
/obj/item/ammo_casing/c27_54cesarzowa/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
AddElement(/datum/element/caseless)
|
||||
|
||||
/obj/projectile/bullet/c27_54cesarzowa
|
||||
name = ".27-54 Cesarzowa piercing bullet"
|
||||
damage = 15
|
||||
armour_penetration = 30
|
||||
wound_bonus = -30
|
||||
bare_wound_bonus = -10
|
||||
|
||||
/obj/item/ammo_box/c27_54cesarzowa
|
||||
name = "ammo box (.27-54 Cesarzowa piercing)"
|
||||
desc = "A box of .27-54 Cesarzowa piercing pistol rounds, holds eighteen cartridges."
|
||||
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
|
||||
icon_state = "27-54cesarzowa_box"
|
||||
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
caliber = CALIBER_CESARZOWA
|
||||
ammo_type = /obj/item/ammo_casing/c27_54cesarzowa
|
||||
max_ammo = 18
|
||||
|
||||
// .27-54 Cesarzowa rubber
|
||||
// Small caliber pistol round meant to be fired out of something that shoots real quick like, this one is less lethal
|
||||
|
||||
/obj/item/ammo_casing/c27_54cesarzowa/rubber
|
||||
name = ".27-54 Cesarzowa rubber bullet casing"
|
||||
desc = "A purple-bodied caseless cartridge home to a small projectile with a flat rubber tip."
|
||||
|
||||
icon_state = "27-54cesarzowa_rubber"
|
||||
|
||||
projectile_type = /obj/projectile/bullet/c27_54cesarzowa/rubber
|
||||
|
||||
/obj/projectile/bullet/c27_54cesarzowa/rubber
|
||||
name = ".27-54 Cesarzowa rubber bullet"
|
||||
stamina = 20
|
||||
damage = 10
|
||||
weak_against_armour = TRUE
|
||||
wound_bonus = -30
|
||||
bare_wound_bonus = -10
|
||||
|
||||
/obj/item/ammo_box/c27_54cesarzowa/rubber
|
||||
name = "ammo box (.27-54 Cesarzowa rubber)"
|
||||
desc = "A box of .27-54 Cesarzowa rubber pistol rounds, holds eighteen cartridges."
|
||||
|
||||
icon_state = "27-54cesarzowa_box_rubber"
|
||||
|
||||
ammo_type = /obj/item/ammo_casing/c27_54cesarzowa/rubber
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
// Casing and projectile for the plasma thrower
|
||||
|
||||
/obj/item/ammo_casing/energy/laser/plasma_glob
|
||||
projectile_type = /obj/projectile/beam/laser/plasma_glob
|
||||
fire_sound = 'modular_skyrat/modules/microfusion/sound/incinerate.ogg'
|
||||
|
||||
/obj/item/ammo_casing/energy/laser/plasma_glob/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
AddElement(/datum/element/caseless)
|
||||
|
||||
/obj/projectile/beam/laser/plasma_glob
|
||||
name = "plasma globule"
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
|
||||
icon_state = "plasma_glob"
|
||||
damage = 10
|
||||
speed = 1.5
|
||||
bare_wound_bonus = 55 // Lasers have a wound bonus of 40, this is a bit higher
|
||||
wound_bonus = -50 // However we do not very much against armor
|
||||
pass_flags = PASSTABLE | PASSGRILLE // His ass does NOT pass through glass!
|
||||
weak_against_armour = TRUE
|
||||
+68
@@ -0,0 +1,68 @@
|
||||
// Various ammo boxes for .310
|
||||
|
||||
/obj/item/ammo_box/c310_cargo_box
|
||||
name = "ammo box (.310 Strilka lethal)"
|
||||
desc = "A box of .310 Strilka lethal rifle rounds, holds ten cartridges."
|
||||
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
|
||||
icon_state = "310_box"
|
||||
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
caliber = CALIBER_STRILKA310
|
||||
ammo_type = /obj/item/ammo_casing/strilka310
|
||||
max_ammo = 10
|
||||
|
||||
// Rubber
|
||||
|
||||
/obj/item/ammo_box/c310_cargo_box/rubber
|
||||
name = "ammo box (.310 Strilka rubber)"
|
||||
desc = "A box of .310 Strilka rubber rifle rounds, holds ten cartridges."
|
||||
|
||||
icon_state = "310_box_rubber"
|
||||
|
||||
ammo_type = /obj/item/ammo_casing/strilka310/rubber
|
||||
|
||||
// AP
|
||||
|
||||
/obj/item/ammo_box/c310_cargo_box/piercing
|
||||
name = "ammo box (.310 Strilka piercing)"
|
||||
desc = "A box of .310 Strilka piercing rifle rounds, holds ten cartridges."
|
||||
|
||||
icon_state = "310_box_ap"
|
||||
|
||||
ammo_type = /obj/item/ammo_casing/strilka310/ap
|
||||
|
||||
// AMR bullet
|
||||
|
||||
/obj/item/ammo_casing/p60strela
|
||||
name = ".60 Strela caseless cartridge"
|
||||
desc = "A massive block of plasma-purple propellant with an equally massive round sticking out the top of it. \
|
||||
While good at killing a man, you'll find most effective use out of destroying things with it."
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
|
||||
icon_state = "amr_bullet"
|
||||
caliber = CALIBER_60STRELA
|
||||
projectile_type = /obj/projectile/bullet/p60strela
|
||||
|
||||
/obj/item/ammo_casing/p60strela/Initialize(mapload)
|
||||
. = ..()
|
||||
AddElement(/datum/element/caseless)
|
||||
|
||||
/obj/projectile/bullet/p60strela // The funny thing is, these are wild but you only get three of them a magazine
|
||||
name =".60 Strela bullet"
|
||||
icon_state = "gaussphase"
|
||||
speed = 0.4
|
||||
damage = 50
|
||||
armour_penetration = 50
|
||||
wound_bonus = 20
|
||||
bare_wound_bonus = 30
|
||||
demolition_mod = 1.8
|
||||
/// How much damage we add to things that are weak to this bullet
|
||||
var/anti_materiel_damage_addition = 30
|
||||
|
||||
/obj/projectile/bullet/p60strela/Initialize(mapload)
|
||||
. = ..()
|
||||
// We do 80 total damage to anything robotic, namely borgs, and robotic simplemobs
|
||||
AddElement(/datum/element/bane, target_type = /mob/living, mob_biotypes = MOB_ROBOTIC, damage_multiplier = 0, added_damage = anti_materiel_damage_addition)
|
||||
+73
@@ -0,0 +1,73 @@
|
||||
// .310 magazine for the Lanca rifle
|
||||
|
||||
/obj/item/ammo_box/magazine/lanca
|
||||
name = "\improper Lanca rifle magazine"
|
||||
desc = "A standard size magazine for Lanca rifles, holds five rounds."
|
||||
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
|
||||
icon_state = "lanca_mag"
|
||||
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
|
||||
ammo_type = /obj/item/ammo_casing/strilka310
|
||||
caliber = CALIBER_STRILKA310
|
||||
max_ammo = 5
|
||||
|
||||
/obj/item/ammo_box/magazine/lanca/spawns_empty
|
||||
start_empty = TRUE
|
||||
|
||||
// Magazine for the Miecz submachinegun
|
||||
|
||||
/obj/item/ammo_box/magazine/miecz
|
||||
name = "\improper Miecz submachinegun magazine"
|
||||
desc = "A standard size magazine for Miecz submachineguns, holds eighteen rounds."
|
||||
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
|
||||
icon_state = "miecz_mag"
|
||||
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
|
||||
ammo_type = /obj/item/ammo_casing/c27_54cesarzowa
|
||||
caliber = CALIBER_CESARZOWA
|
||||
max_ammo = 18
|
||||
|
||||
/obj/item/ammo_box/magazine/miecz/spawns_empty
|
||||
start_empty = TRUE
|
||||
|
||||
// Plasma thrower 'magazine'
|
||||
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery
|
||||
name = "plasma power pack"
|
||||
desc = "A rechargeable, detachable battery that serves as a power source for plasma projectors."
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
|
||||
base_icon_state = "plasma_battery"
|
||||
icon_state = "plasma_battery"
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
ammo_type = /obj/item/ammo_casing/energy/laser/plasma_glob
|
||||
caliber = CALIBER_LASER
|
||||
max_ammo = 15
|
||||
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery/update_icon_state() // FUCK YOU /OBJ/ITEM/AMMO_BOX/MAGAZINE/RECHARGE
|
||||
. = ..()
|
||||
icon_state = base_icon_state
|
||||
|
||||
// Shotgun revolver's cylinder
|
||||
|
||||
/obj/item/ammo_box/magazine/internal/cylinder/rev12ga
|
||||
name = "\improper 12 GA revolver cylinder"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun
|
||||
caliber = CALIBER_SHOTGUN
|
||||
max_ammo = 4
|
||||
multiload = FALSE
|
||||
|
||||
// AMR magazine
|
||||
|
||||
/obj/item/ammo_box/magazine/wylom
|
||||
name = "anti-materiel magazine (.60 Strela)"
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
|
||||
icon_state = "wylom_mag"
|
||||
base_icon_state = "wylom_mag"
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
ammo_type = /obj/item/ammo_casing/p60strela
|
||||
max_ammo = 3
|
||||
caliber = CALIBER_60STRELA
|
||||
+116
@@ -0,0 +1,116 @@
|
||||
// Plasma spewing pistol
|
||||
// Sprays a wall of plasma that sucks against armor but fucks against unarmored targets
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_thrower
|
||||
name = "\improper Szot 'Słońce' plasma projector"
|
||||
desc = "An outdated sidearm rarely seen in use by some members of the CIN. Spews an inaccurate stream of searing plasma out the magnetic barrel so long as it has power and the trigger is pulled."
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi'
|
||||
icon_state = "slonce"
|
||||
|
||||
fire_sound = 'modular_skyrat/modules/microfusion/sound/incinerate.ogg'
|
||||
fire_sound_volume = 40 // This thing is comically loud otherwise
|
||||
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/plasma_battery
|
||||
can_suppress = FALSE
|
||||
show_bolt_icon = FALSE
|
||||
casing_ejector = FALSE
|
||||
empty_indicator = FALSE
|
||||
bolt_type = BOLT_TYPE_OPEN
|
||||
fire_delay = 0.1 SECONDS
|
||||
spread = 15
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_thrower/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
AddComponent(/datum/component/automatic_fire, autofire_shot_delay = fire_delay)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_thrower/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_thrower/examine_more(mob/user)
|
||||
. = ..()
|
||||
|
||||
. += "The 'Słońce' started life as an experiment in advancing the field of accelerated \
|
||||
plasma weaponry. Despite the design's obvious shortcomings in terms of accuracy and \
|
||||
range, the CIN combined military command (which we'll call the CMC from now on) took \
|
||||
interest in the weapon as a means to counter Sol's more advanced armor technology. \
|
||||
As it would turn out, the plasma globules created by the weapon were really not \
|
||||
as effective against armor as the CMC had hoped, quite the opposite actually. \
|
||||
What the plasma did do well however was inflict grevious burns upon anyone unfortunate \
|
||||
enough to get hit by it unprotected. For this reason, the 'Słońce' saw frequent use by \
|
||||
army officers and ship crews who needed a backup weapon to incinerate the odd space \
|
||||
pirate or prisoner of war."
|
||||
|
||||
return .
|
||||
|
||||
// Plasma sharpshooter pistol
|
||||
// Shoots single, strong plasma blasts at a slow rate
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_marksman
|
||||
name = "\improper Szot 'Gwiazda' plasma sharpshooter"
|
||||
desc = "An outdated sidearm rarely seen in use by some members of the CIN. Fires relatively accurate globs of searing plasma."
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi'
|
||||
icon_state = "gwiazda"
|
||||
|
||||
fire_sound = 'modular_skyrat/modules/microfusion/sound/burn.ogg'
|
||||
fire_sound_volume = 40 // This thing is comically loud otherwise
|
||||
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/plasma_battery
|
||||
can_suppress = FALSE
|
||||
show_bolt_icon = FALSE
|
||||
casing_ejector = FALSE
|
||||
empty_indicator = FALSE
|
||||
bolt_type = BOLT_TYPE_OPEN
|
||||
fire_delay = 0.6 SECONDS
|
||||
spread = 2.5
|
||||
|
||||
projectile_damage_multiplier = 3 // 30 damage a shot
|
||||
projectile_wound_bonus = 10 // +55 of the base projectile, burn baby burn
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_marksman/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_marksman/examine_more(mob/user)
|
||||
. = ..()
|
||||
|
||||
. += "The 'Gwiazda' is a further refinement of the 'Słońce' design. with improved \
|
||||
energy cycling, magnetic launchers built to higher precision, and an overall more \
|
||||
ergonomic design. While it still fails to perform against armor, the weapon is \
|
||||
significantly more accurate and higher power, at expense of a much lower firerate. \
|
||||
Opinions on this weapon within military service were highly mixed, with many preferring \
|
||||
the sheer stopping power a spray of plasma could produce, with others loving the new ability \
|
||||
to hit something in front of you for once."
|
||||
|
||||
return .
|
||||
|
||||
// A revolver, but it can hold shotgun shells
|
||||
// Woe, buckshot be upon ye
|
||||
|
||||
/obj/item/gun/ballistic/revolver/shotgun_revolver
|
||||
name = "\improper Szot 'Bóbr' 12 GA revolver"
|
||||
desc = "An outdated sidearm rarely seen in use by some members of the CIN. A revolver type design with a four shell cylinder. That's right, shell, this one shoots twelve guage."
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev12ga
|
||||
recoil = SAWN_OFF_RECOIL
|
||||
weapon_weight = WEAPON_MEDIUM
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi'
|
||||
icon_state = "bobr"
|
||||
fire_sound = 'modular_skyrat/modules/sec_haul/sound/revolver_fire.ogg'
|
||||
spread = SAWN_OFF_ACC_PENALTY
|
||||
|
||||
/obj/item/gun/ballistic/revolver/shotgun_revolver/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT)
|
||||
|
||||
/obj/item/gun/ballistic/revolver/shotgun_revolver/examine_more(mob/user)
|
||||
. = ..()
|
||||
|
||||
. += "The 'Bóbr' started development as a limited run sporting weapon before \
|
||||
the military took interest. The market quickly changed from sport shooting \
|
||||
targets, to sport shooting SolFed strike teams once the conflict broke out. \
|
||||
This pattern is different from the original civilian version, with a military \
|
||||
standard pistol grip and weather resistant finish. While the 'Bóbr' was not \
|
||||
a weapon standard issued to every CIN soldier, it was available for relatively \
|
||||
cheap, and thus became rather popular among the ranks."
|
||||
|
||||
return .
|
||||
+123
@@ -0,0 +1,123 @@
|
||||
// Semi-automatic rifle firing .310 with reduced damage compared to a Sakhno
|
||||
|
||||
/obj/item/gun/ballistic/automatic/lanca
|
||||
name = "\improper Szot 'Lanca' Battle Rifle"
|
||||
desc = "A relatively compact, long barreled bullpup battle rifle chambered for .310 Strilka. Has an integrated sight with \
|
||||
a surprisingly functional amount of magnification, given its place of origin."
|
||||
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_48.dmi'
|
||||
icon_state = "lanca"
|
||||
|
||||
worn_icon = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_worn.dmi'
|
||||
worn_icon_state = "lanca"
|
||||
|
||||
lefthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_lefthand.dmi'
|
||||
righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_righthand.dmi'
|
||||
inhand_icon_state = "lanca"
|
||||
|
||||
SET_BASE_PIXEL(-8, 0)
|
||||
|
||||
special_mags = FALSE
|
||||
|
||||
bolt_type = BOLT_TYPE_STANDARD
|
||||
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
weapon_weight = WEAPON_HEAVY
|
||||
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
|
||||
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/lanca
|
||||
|
||||
fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/battle_rifle.ogg'
|
||||
suppressed_sound = 'modular_skyrat/modules/modular_weapons/sounds/suppressed_heavy.ogg'
|
||||
can_suppress = FALSE
|
||||
|
||||
can_bayonet = FALSE
|
||||
|
||||
burst_size = 1
|
||||
fire_delay = 1.2 SECONDS
|
||||
actions_types = list()
|
||||
|
||||
recoil = 0.5
|
||||
spread = 2.5
|
||||
projectile_wound_bonus = -20
|
||||
|
||||
/obj/item/gun/ballistic/automatic/lanca/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/scope, range_modifier = 1.5)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/lanca/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/lanca/examine_more(mob/user)
|
||||
. = ..()
|
||||
|
||||
. += "The Lanca is a now relatively dated replacement for Kalashnikov pattern rifles \
|
||||
adopted by states now combining to form the CIN. While the rifle that came before them \
|
||||
had its benefits, leadership of many armies started to realize that the Kalashnikov-based \
|
||||
rifles were really showing their age once the variants began reaching the thousands in serial. \
|
||||
The solution was presented by a then new company, Szot Dynamica. This new rifle, not too \
|
||||
unlike the one you are seeing now, adopted all of the latest technology of the time. Lightweight \
|
||||
caseless ammunition, well known for its use in Sakhno rifles, as well as various electronics and \
|
||||
other incredible technological advancements. These advancements may have already been around since \
|
||||
before the creation of even the Sakhno, but the fact you're seeing this now fifty year old design \
|
||||
must mean something, right?"
|
||||
|
||||
return .
|
||||
|
||||
/obj/item/gun/ballistic/automatic/lanca/no_mag
|
||||
spawnwithmagazine = FALSE
|
||||
|
||||
// The AMR
|
||||
// This sounds a lot scarier than it actually is, you'll just have to trust me here
|
||||
|
||||
/obj/item/gun/ballistic/automatic/wylom
|
||||
name = "\improper Szot 'Wyłom' AMR"
|
||||
desc = "A massive, outdated beast of an anti materiel rifle that was once in use by CIN military forces. Fires the devastating .60 Strela caseless round, \
|
||||
the massively overperforming penetration of which being the reason this weapon was discontinued."
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_64.dmi'
|
||||
base_pixel_x = -16 // This baby is 64 pixels wide
|
||||
pixel_x = -16
|
||||
righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_left.dmi'
|
||||
lefthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/inhands_64_right.dmi'
|
||||
inhand_x_dimension = 64
|
||||
inhand_y_dimension = 64
|
||||
worn_icon = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_worn.dmi'
|
||||
icon_state = "wylom"
|
||||
inhand_icon_state = "wylom"
|
||||
worn_icon_state = "wylom"
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
slot_flags = ITEM_SLOT_BACK
|
||||
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/wylom
|
||||
can_suppress = FALSE
|
||||
can_bayonet = FALSE
|
||||
|
||||
fire_sound = 'modular_skyrat/modules/novaya_ert/sound/amr_fire.ogg'
|
||||
fire_sound_volume = 100 // BOOM BABY
|
||||
|
||||
recoil = 4
|
||||
|
||||
weapon_weight = WEAPON_HEAVY
|
||||
burst_size = 1
|
||||
fire_delay = 2 SECONDS
|
||||
actions_types = list()
|
||||
|
||||
force = 15 // I mean if you're gonna beat someone with the thing you might as well get damage appropriate for how big the fukken thing is
|
||||
|
||||
/obj/item/gun/ballistic/automatic/wylom/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/wylom/examine_more(mob/user)
|
||||
. = ..()
|
||||
|
||||
. += "The 'Wyłom' AMR was a weapon not originally made for unaided human hands. \
|
||||
The original rifle had mounting points for a specialized suit attachment system, \
|
||||
not too much unlike heavy smartguns that can be seen across the galaxy. CIN military \
|
||||
command, however, deemed that expensive exoskeletons and rigs for carrying an organic \
|
||||
anti material system were simply not needed, and that soldiers should simply 'deal with it'. \
|
||||
Unsurprisingly, soldiers assigned this weapon tend to not be a massive fan of that fact, \
|
||||
and smekalka within CIN ranks is common with troops finding novel ways to carry and use \
|
||||
their large rifles with as little effort as possible. Most of these novel methods, of course, \
|
||||
tend to shatter when the rifle is actually fired."
|
||||
|
||||
return .
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
// Rapid firing submachinegun firing .27-54 Cesarzowa
|
||||
|
||||
/obj/item/gun/ballistic/automatic/miecz
|
||||
name = "\improper Szot 'Miecz' Submachinegun"
|
||||
desc = "A short barrel, further compacted conversion of the 'Lanca' rifle to fire pistol caliber cartridges. \
|
||||
Due to the intended purpose of the weapon, and less than optimal ranged performance of the projectile, it has \
|
||||
nothing more than basic glow-sights as opposed to the ranged scope Lanca users might be used to."
|
||||
|
||||
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_48.dmi'
|
||||
icon_state = "miecz"
|
||||
|
||||
inhand_icon_state = "c20r"
|
||||
worn_icon_state = "gun"
|
||||
|
||||
SET_BASE_PIXEL(-8, 0)
|
||||
|
||||
special_mags = FALSE
|
||||
|
||||
bolt_type = BOLT_TYPE_STANDARD
|
||||
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
weapon_weight = WEAPON_MEDIUM
|
||||
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
|
||||
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/miecz
|
||||
|
||||
fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/smg_light.ogg'
|
||||
can_suppress = FALSE
|
||||
|
||||
can_bayonet = FALSE
|
||||
|
||||
burst_size = 1
|
||||
fire_delay = 0.2 SECONDS
|
||||
actions_types = list()
|
||||
|
||||
spread = 5
|
||||
|
||||
/obj/item/gun/ballistic/automatic/miecz/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/automatic_fire, fire_delay)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/miecz/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/miecz/examine_more(mob/user)
|
||||
. = ..()
|
||||
|
||||
. += "The Meicz is one of the newest weapons to come out of CIN member state hands and \
|
||||
into the wild, typically the frontier. It was built alongside the round it fires, the \
|
||||
.27-54 Cesarzawa pistol round. Based on the proven Lanca design, it seeks to bring that \
|
||||
same reliable weapon design into the factor of a submachinegun. While it is significantly \
|
||||
larger than many comparable weapons in SolFed use, it more than makes up for it with ease \
|
||||
of control and significant firerate."
|
||||
|
||||
return .
|
||||
|
||||
/obj/item/gun/ballistic/automatic/miecz/no_mag
|
||||
spawnwithmagazine = FALSE
|
||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 942 B |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 939 B |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
@@ -121,8 +121,8 @@
|
||||
icon = 'modular_skyrat/modules/novaya_ert/icons/turret_deployable.dmi'
|
||||
icon_state = "living"
|
||||
base_icon_state = "living"
|
||||
stun_projectile = /obj/projectile/bullet/a762x39/rubber
|
||||
lethal_projectile = /obj/projectile/bullet/a762x39
|
||||
stun_projectile = /obj/projectile/bullet/c27_54cesarzowa/rubber
|
||||
lethal_projectile = /obj/projectile/bullet/c27_54cesarzowa
|
||||
max_integrity = 150
|
||||
req_access = list(ACCESS_CENT_GENERAL)
|
||||
faction = list(FACTION_NEUTRAL, FACTION_ERT)
|
||||
@@ -227,10 +227,9 @@
|
||||
new /obj/item/gun/ballistic/automatic/l6_saw/unrestricted(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/l6_saw(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/krinkov(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/krinkov/emp(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/krinkov/fire(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/krinkov/ricochet(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/krinkov/ap(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/krinkov(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/krinkov(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/krinkov(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/nri_smg(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/nri_smg(src)
|
||||
new /obj/item/storage/toolbox/ammobox/full/aps(src)
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
/obj/item/gun/ballistic/automatic/nri_smg
|
||||
name = "\improper QLP/04 SMG"
|
||||
desc = "A 4.2x30mm submachine gun developed for military and police use by the now-absorbed by the Izhevsk Coalition arms manufacturer. \
|
||||
Features a mag insertion-activated holosight providing its user with information regarding the gun's ammo count and its general status, as well as \
|
||||
a folding stock. Due to its efficiency, is currently in use by the NRI's reserve military forces; support and vehicle crews, \
|
||||
not including numerous police patrols scattered across the border."
|
||||
worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
|
||||
icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
|
||||
lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
|
||||
righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
|
||||
worn_icon_state = "nri_smg"
|
||||
icon_state = "nri_smg"
|
||||
inhand_icon_state = "nri_smg"
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/uzim9mm
|
||||
fire_delay = 1
|
||||
burst_size = 5
|
||||
dual_wield_spread = 5
|
||||
spread = 5
|
||||
can_suppress = FALSE
|
||||
mag_display = TRUE
|
||||
empty_indicator = TRUE
|
||||
alt_icons = TRUE
|
||||
fire_sound = 'sound/weapons/gun/smg/shot_alt.ogg'
|
||||
|
||||
/obj/item/gun/ballistic/automatic/nri_smg/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_IZHEVSK)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/nri
|
||||
name = "\improper Szabo-Ivanek service pistol"
|
||||
desc = "A mass produced NRI-made modified reproduction of the Wespe line of handguns rechambered in 9×25mm.\
|
||||
'PATRIOT DEFENSE SYSTEMS' is inscribed on the receiver, indicating it's been made with a plasteel printer."
|
||||
icon = 'modular_skyrat/modules/novaya_ert/icons/pistol.dmi'
|
||||
icon_state = "ladon"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm_aps
|
||||
burst_size = 3
|
||||
fire_delay = 3
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/nri/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_IZHEVSK)
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
/obj/item/storage/belt/military/nri/soldier/PopulateContents()
|
||||
generate_items_inside(list(
|
||||
/obj/item/ammo_box/magazine/akm = 4,
|
||||
/obj/item/ammo_box/magazine/lanca = 4,
|
||||
/obj/item/knife/combat = 1,
|
||||
/obj/item/grenade/smokebomb = 1,
|
||||
/obj/item/grenade/frag = 1,
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
/obj/item/storage/belt/military/nri/captain/full/PopulateContents()
|
||||
generate_items_inside(list(
|
||||
/obj/item/ammo_box/magazine/akm = 4,
|
||||
/obj/item/ammo_box/magazine/lanca = 4,
|
||||
/obj/item/knife/combat = 1,
|
||||
/obj/item/grenade/smokebomb = 1,
|
||||
/obj/item/grenade/frag = 1,
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
/obj/item/storage/belt/military/nri/medic/full/PopulateContents()
|
||||
generate_items_inside(list(
|
||||
/obj/item/ammo_box/magazine/uzim9mm = 4,
|
||||
/obj/item/ammo_box/magazine/miecz = 4,
|
||||
/obj/item/knife/combat = 1,
|
||||
/obj/item/grenade/smokebomb = 1,
|
||||
/obj/item/grenade/frag = 1,
|
||||
@@ -63,7 +63,7 @@
|
||||
|
||||
/obj/item/storage/belt/military/nri/engineer/full/PopulateContents()
|
||||
generate_items_inside(list(
|
||||
/obj/item/ammo_box/magazine/uzim9mm = 4,
|
||||
/obj/item/ammo_box/magazine/miecz = 4,
|
||||
/obj/item/knife/combat = 1,
|
||||
/obj/item/grenade/smokebomb = 1,
|
||||
/obj/item/grenade/frag = 1,
|
||||
|
||||
@@ -10,18 +10,21 @@
|
||||
gloves = /obj/item/clothing/gloves/combat
|
||||
belt = /obj/item/storage/belt/military/nri/soldier
|
||||
back = /obj/item/mod/control/pre_equipped/frontline/ert
|
||||
backpack_contents = list(/obj/item/storage/box/nri_survival_pack,
|
||||
/obj/item/storage/medkit/emergency,
|
||||
/obj/item/ammo_box/magazine/m9mm_aps,
|
||||
/obj/item/advanced_choice_beacon/nri/heavy,
|
||||
/obj/item/beamout_tool,
|
||||
/obj/item/crucifix,
|
||||
/obj/item/reagent_containers/cup/glass/waterbottle/large/cryptobiolin)
|
||||
l_pocket = /obj/item/gun/ballistic/automatic/pistol/nri
|
||||
r_pocket = /obj/item/ammo_box/magazine/m9mm_aps
|
||||
backpack_contents = list(
|
||||
/obj/item/storage/box/nri_survival_pack,
|
||||
/obj/item/storage/medkit/emergency,
|
||||
/obj/item/advanced_choice_beacon/nri/heavy,
|
||||
/obj/item/beamout_tool,
|
||||
/obj/item/crucifix,
|
||||
/obj/item/reagent_containers/cup/glass/waterbottle/large/cryptobiolin,
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery,
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_marksman,
|
||||
)
|
||||
l_pocket = /obj/item/knife/combat/survival
|
||||
r_pocket = /obj/item/ammo_box/magazine/recharge/plasma_battery
|
||||
shoes = /obj/item/clothing/shoes/combat
|
||||
|
||||
l_hand = /obj/item/gun/ballistic/automatic/akm/nri
|
||||
l_hand = /obj/item/gun/ballistic/automatic/lanca
|
||||
|
||||
id = /obj/item/card/id/advanced/centcom/ert/nri
|
||||
id_trim = /datum/id_trim/nri
|
||||
@@ -41,12 +44,13 @@
|
||||
/obj/item/megaphone,
|
||||
/obj/item/binoculars,
|
||||
/obj/item/clothing/head/beret/sec/nri,
|
||||
/obj/item/ammo_box/magazine/m9mm_aps,
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery,
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_thrower,
|
||||
/obj/item/beamout_tool,
|
||||
/obj/item/crucifix,
|
||||
/obj/item/reagent_containers/cup/glass/waterbottle/large/cryptobiolin)
|
||||
|
||||
l_hand = /obj/item/gun/ballistic/automatic/akm/nri
|
||||
l_hand = /obj/item/gun/ballistic/automatic/lanca
|
||||
|
||||
id_trim = /datum/id_trim/nri/commander
|
||||
|
||||
@@ -72,7 +76,7 @@
|
||||
/obj/item/reagent_containers/cup/glass/waterbottle/large/cryptobiolin)
|
||||
|
||||
l_hand = /obj/item/shield/riot/pointman/nri
|
||||
r_hand = /obj/item/gun/ballistic/automatic/nri_smg
|
||||
r_hand = /obj/item/gun/ballistic/automatic/miecz
|
||||
|
||||
id_trim = /datum/id_trim/nri/medic
|
||||
|
||||
@@ -94,7 +98,7 @@
|
||||
/obj/item/reagent_containers/cup/glass/waterbottle/large/cryptobiolin)
|
||||
|
||||
l_hand = /obj/item/storage/belt/utility/full/powertools
|
||||
r_hand = /obj/item/gun/ballistic/automatic/nri_smg
|
||||
r_hand = /obj/item/gun/ballistic/automatic/miecz
|
||||
|
||||
id_trim = /datum/id_trim/nri/engineer
|
||||
|
||||
@@ -108,11 +112,10 @@
|
||||
suit = /obj/item/clothing/suit/jacket/officer/tan
|
||||
suit_store = null
|
||||
gloves = /obj/item/clothing/gloves/combat
|
||||
belt = /obj/item/gun/ballistic/revolver/nagant
|
||||
belt = /obj/item/gun/ballistic/revolver/shotgun_revolver
|
||||
back = /obj/item/storage/backpack/satchel/leather
|
||||
backpack_contents = list(/obj/item/storage/box/nri_survival_pack,
|
||||
/obj/item/ammo_box/n762,
|
||||
/obj/item/ammo_box/n762,
|
||||
/obj/item/ammo_box/advanced/s12gauge/express,
|
||||
/obj/item/suppressor/standard,
|
||||
/obj/item/knife/combat,
|
||||
/obj/item/beamout_tool)
|
||||
@@ -157,9 +160,9 @@
|
||||
belt = /obj/item/clipboard
|
||||
back = /obj/item/storage/backpack/satchel/leather
|
||||
backpack_contents = list(/obj/item/storage/box/nri_survival_pack,
|
||||
/obj/item/gun/ballistic/automatic/pistol/nri,
|
||||
/obj/item/ammo_box/magazine/m9mm_aps,
|
||||
/obj/item/ammo_box/magazine/m9mm_aps,
|
||||
/obj/item/gun/ballistic/automatic/pistol/plasma_marksman,
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery,
|
||||
/obj/item/ammo_box/magazine/recharge/plasma_battery,
|
||||
/obj/item/storage/medkit/expeditionary,
|
||||
/obj/item/melee/baton/telescopic,
|
||||
/obj/item/beamout_tool)
|
||||
|
||||
@@ -1,197 +0,0 @@
|
||||
// Plasma spewing pistol
|
||||
// Sprays a wall of plasma that sucks against armor but fucks against unarmored targets
|
||||
|
||||
/obj/item/gun/energy/laser/plasma_thrower
|
||||
name = "\improper Tkach 'Zirka' plasma projector"
|
||||
desc = "An outdated sidearm rarely seen in use by some members of the CIN. Spews an inaccurate stream of searing plasma out the magnetic barrel so long as it has power and the trigger is pulled."
|
||||
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/guns_32.dmi'
|
||||
icon_state = "plasmathrower"
|
||||
|
||||
fire_sound = 'modular_skyrat/modules/microfusion/sound/incinerate.ogg'
|
||||
fire_sound_volume = 40 // This thing is comically loud otherwise
|
||||
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
can_suppress = FALSE
|
||||
fire_delay = 1
|
||||
spread = 15
|
||||
|
||||
ammo_type = list(/obj/item/ammo_casing/energy/laser/plasma_glob)
|
||||
|
||||
/obj/item/gun/energy/laser/plasma_thrower/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/automatic_fire, 0.1 SECONDS)
|
||||
|
||||
/obj/item/gun/energy/laser/plasma_thrower/examine(mob/user)
|
||||
. = ..()
|
||||
. += "The plasma globs have <b>reduced effectiveness against blobs</b>."
|
||||
|
||||
/obj/item/gun/energy/laser/plasma_thrower/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_TKACH)
|
||||
|
||||
/obj/item/gun/energy/laser/plasma_thrower/examine_more(mob/user)
|
||||
. = ..()
|
||||
. += "The Zirka started life as an experiment in advancing the field of accelerated \
|
||||
plasma weaponry. Despite the design's obvious shortcomings in terms of accuracy and \
|
||||
range, the CIN combined military command (which we'll call the CMC from now on) took \
|
||||
interest in the weapon as a means to counter Sol's more advanced armor technology. \
|
||||
As it would turn out, the plasma globules created by the weapon were really not \
|
||||
as effective against armor as the CMC had hoped, quite the opposite actually. \
|
||||
What the plasma did do well however was inflict grevious burns upon anyone unfortunate \
|
||||
enough to get hit by it unprotected. For this reason, the Zirka saw frequent use by \
|
||||
army officers and ship crews who needed a backup weapon to incinerate the odd space \
|
||||
pirate or prisoner of war."
|
||||
|
||||
// Casing and projectile for the plasma thrower
|
||||
/obj/item/ammo_casing/energy/laser/plasma_glob
|
||||
projectile_type = /obj/projectile/beam/laser/plasma_glob
|
||||
fire_sound = 'modular_skyrat/modules/microfusion/sound/incinerate.ogg'
|
||||
e_cost = LASER_SHOTS(20, STANDARD_CELL_CHARGE)
|
||||
|
||||
/obj/projectile/beam/laser/plasma_glob
|
||||
name = "plasma globule"
|
||||
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/ammo.dmi'
|
||||
icon_state = "plasma_glob"
|
||||
damage = 10
|
||||
speed = 1.5
|
||||
bare_wound_bonus = 75 // Lasers already get wild wound bonus this is just a bit higher than that
|
||||
wound_bonus = -50
|
||||
pass_flags = PASSTABLE | PASSGRILLE // His ass does NOT pass through glass!
|
||||
weak_against_armour = TRUE
|
||||
|
||||
/obj/projectile/beam/laser/plasma_glob/on_hit(atom/target, blocked = 0, pierce_hit)
|
||||
if(istype(target, /obj/structure/blob) || HAS_TRAIT(target, TRAIT_BLOB_ALLY))
|
||||
damage = damage * 0.75
|
||||
return ..()
|
||||
|
||||
// A revolver, but it can hold shotgun shells
|
||||
// Woe, buckshot be upon ye
|
||||
|
||||
/obj/item/gun/ballistic/revolver/cin_shotgun_revolver
|
||||
name = "\improper Tkach 'Ya-Sui' 12 GA revolver"
|
||||
desc = "An outdated sidearm rarely seen in use by some members of the CIN. A revolver type design with a three shell cylinder. That's right, shell, this one shoots twelve guage."
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev12ga
|
||||
recoil = SAWN_OFF_RECOIL
|
||||
weapon_weight = WEAPON_HEAVY
|
||||
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/guns_32.dmi'
|
||||
icon_state = "shawty_revolver"
|
||||
fire_sound = 'modular_skyrat/modules/sec_haul/sound/revolver_fire.ogg'
|
||||
spread = SAWN_OFF_ACC_PENALTY
|
||||
|
||||
/obj/item/gun/ballistic/revolver/cin_shotgun_revolver/give_manufacturer_examine()
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_TKACH)
|
||||
|
||||
/obj/item/gun/ballistic/revolver/cin_shotgun_revolver/examine_more(mob/user)
|
||||
. = ..()
|
||||
|
||||
. += "The Ya-Sui started development as a limited run sporting weapon before \
|
||||
the border war broke out. The market quickly changed from sport shooting \
|
||||
targets, to sport shooting SolFed strike teams once the conflict broke out. \
|
||||
This pattern is different from the original civilian version, with a military \
|
||||
standard pistol grip and weather resistant finish. While the Ya-Sui was not \
|
||||
a weapon standard issued to every CIN soldier, it was available for relatively \
|
||||
cheap, and thus became rather popular among the ranks."
|
||||
|
||||
return .
|
||||
|
||||
// Shotgun revolver's cylinder
|
||||
|
||||
/obj/item/ammo_box/magazine/internal/cylinder/rev12ga
|
||||
name = "\improper 12 GA revolver cylinder"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun
|
||||
caliber = CALIBER_SHOTGUN
|
||||
max_ammo = 3
|
||||
multiload = FALSE
|
||||
|
||||
// The AMR
|
||||
// This sounds a lot scarier than it actually is, you'll just have to trust me here
|
||||
|
||||
/obj/item/gun/ballistic/automatic/cin_amr
|
||||
name = "\improper Tkach-Tsuneyo AMR"
|
||||
desc = "A massive, outdated beast of an anti materiel rifle that was once in use by CIN military forces. Fires the devastating .60 Strela caseless round, the massively overperforming penetration of which being the reason this weapon was discontinued."
|
||||
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/guns_64.dmi'
|
||||
base_pixel_x = -16 // This baby is 64 pixels wide
|
||||
pixel_x = -16
|
||||
righthand_file = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/inhands_64_right.dmi'
|
||||
lefthand_file = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/inhands_64_left.dmi'
|
||||
inhand_x_dimension = 64
|
||||
inhand_y_dimension = 64
|
||||
worn_icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/onmob.dmi'
|
||||
icon_state = "amr"
|
||||
inhand_icon_state = "amr"
|
||||
worn_icon_state = "amr"
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
slot_flags = ITEM_SLOT_BACK
|
||||
|
||||
accepted_magazine_type = /obj/item/ammo_box/magazine/cin_amr
|
||||
can_suppress = FALSE
|
||||
can_bayonet = FALSE
|
||||
|
||||
fire_sound = 'modular_skyrat/modules/novaya_ert/sound/amr_fire.ogg'
|
||||
fire_sound_volume = 100 // BOOM BABY
|
||||
|
||||
recoil = 4
|
||||
|
||||
weapon_weight = WEAPON_HEAVY
|
||||
burst_size = 1
|
||||
fire_delay = 2 SECONDS
|
||||
actions_types = list()
|
||||
|
||||
force = 15 // I mean if you're gonna beat someone with the thing you might as well get damage appropriate for how big the fukken thing is
|
||||
|
||||
/obj/item/gun/ballistic/automatic/cin_amr/give_manufacturer_examine()
|
||||
|
||||
AddElement(/datum/element/manufacturer_examine, COMPANY_TKACH)
|
||||
|
||||
/obj/item/gun/ballistic/automatic/cin_amr/examine_more(mob/user)
|
||||
. = ..()
|
||||
|
||||
. += "The Tkach-Tsuneyo AMR was, as the name may suggest, a cooperation \
|
||||
in design between both the Tkach Design Bureau, and an (at the time) \
|
||||
relatively new Tsuneyo Defense Systems. The goal was simple, the CIN \
|
||||
needed a weapon capable of easily penetrating SolFed armor in a man \
|
||||
portable format. What they got was the gun you're looking at now, a \
|
||||
monster of a weapon firing a proprietary caseless cartridge that \
|
||||
certainly fit the order. The round ended up being so capable, in fact, \
|
||||
that the weapon had no use anywhere once the border war ended. This \
|
||||
is partially due to the fact that the rounds will go so cleanly through \
|
||||
a man that it would be more cost effective to shoot him with any \
|
||||
other weapon. It may also just be that the weapon is so large and \
|
||||
unwieldy."
|
||||
|
||||
return .
|
||||
|
||||
// AMR magazine
|
||||
|
||||
/obj/item/ammo_box/magazine/cin_amr
|
||||
name = "anti-materiel magazine (.60 Strela)"
|
||||
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/ammo.dmi'
|
||||
icon_state = "amr_mag"
|
||||
base_icon_state = "amr_mag"
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY
|
||||
ammo_type = /obj/item/ammo_casing/p60strela
|
||||
max_ammo = 3
|
||||
caliber = CALIBER_60STRELA
|
||||
|
||||
// AMR bullet
|
||||
|
||||
/obj/item/ammo_casing/p60strela
|
||||
name = ".60 Strela caseless cartridge"
|
||||
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/ammo.dmi'
|
||||
icon_state = "amr_bullet"
|
||||
desc = "A massive block of propellant with an equally massive round sticking out the top of it."
|
||||
caliber = CALIBER_60STRELA
|
||||
projectile_type = /obj/projectile/bullet/p60strela
|
||||
|
||||
/obj/item/ammo_casing/p60strela/Initialize(mapload)
|
||||
. = ..()
|
||||
AddElement(/datum/element/caseless)
|
||||
|
||||
/obj/projectile/bullet/p60strela // The funny thing is, these are wild but you only get three of them
|
||||
name =".60 Strela bullet"
|
||||
icon_state = "gaussphase"
|
||||
speed = 0.4
|
||||
damage = 50
|
||||
armour_penetration = 75
|
||||
wound_bonus = -30
|
||||
bare_wound_bonus = -15
|
||||
projectile_piercing = PASSGLASS | PASSMACHINE | PASSSTRUCTURE | PASSDOORS | PASSGRILLE // Wallbang (except it cant penetrate walls) baby
|
||||
@@ -25,32 +25,12 @@
|
||||
/obj/item/storage/toolbox/ammobox/full/krinkov
|
||||
name = "ammo box (Krinkov)"
|
||||
desc = "It contains a few magazines."
|
||||
ammo_type = /obj/item/ammo_box/magazine/akm
|
||||
ammo_type = /obj/item/ammo_box/magazine/lanca
|
||||
amount = 7
|
||||
|
||||
/obj/item/storage/toolbox/ammobox/full/krinkov/emp
|
||||
name = "ammo box (Krinkov, EMP)"
|
||||
desc = "It contains a few magazines."
|
||||
ammo_type = /obj/item/ammo_box/magazine/akm/emp
|
||||
|
||||
/obj/item/storage/toolbox/ammobox/full/krinkov/fire
|
||||
name = "ammo box (Krinkov, incendiary)"
|
||||
desc = "It contains a few magazines."
|
||||
ammo_type = /obj/item/ammo_box/magazine/akm/fire
|
||||
|
||||
/obj/item/storage/toolbox/ammobox/full/krinkov/ricochet
|
||||
name = "ammo box (Krinkov, match)"
|
||||
desc = "It contains a few magazines."
|
||||
ammo_type = /obj/item/ammo_box/magazine/akm/ricochet
|
||||
|
||||
/obj/item/storage/toolbox/ammobox/full/krinkov/ap
|
||||
name = "ammo box (Krinkov, armor piercing)"
|
||||
desc = "It contains a few magazines."
|
||||
ammo_type = /obj/item/ammo_box/magazine/akm/ap
|
||||
|
||||
/obj/item/storage/toolbox/ammobox/full/nri_smg
|
||||
name = "ammo box (QLP/04)"
|
||||
ammo_type = /obj/item/ammo_box/magazine/uzim9mm
|
||||
ammo_type = /obj/item/ammo_box/magazine/miecz
|
||||
amount = 7
|
||||
|
||||
/obj/item/storage/toolbox/ammobox/full/l6_saw
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 959 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 939 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1011 B |
@@ -1,6 +1,10 @@
|
||||
/datum/opposing_force_equipment/ammo_exotic
|
||||
category = OPFOR_EQUIPMENT_CATEGORY_AMMO_EXOTIC
|
||||
|
||||
/datum/opposing_force_equipment/ammo_exotic/rubber27_54
|
||||
description = "A box of .27-54 Cesarzowa Rubber rounds, useful for incapacitating targets without causing too much extra harm."
|
||||
item_type = /obj/item/ammo_box/c27_54cesarzowa/rubber
|
||||
|
||||
/datum/opposing_force_equipment/ammo_exotic/ripper35
|
||||
description = "A box of .35 Sol rounds, hollow-tipped for maximum damage against NON-ARMOURED combatants."
|
||||
item_type = /obj/item/ammo_box/c35sol/ripper
|
||||
@@ -17,6 +21,14 @@
|
||||
description = "A box of .40 Sol Fragmentation rounds, useful for incapacitating your victim ASAP, no matter if they live or die."
|
||||
item_type = /obj/item/ammo_box/c40sol/fragmentation
|
||||
|
||||
/datum/opposing_force_equipment/ammo_exotic/rubber310
|
||||
description = "A box of .310 Strilka Rubber rounds, useful for incapacitating targets without causing too much extra harm."
|
||||
item_type = /obj/item/ammo_box/c310_cargo_box/rubber
|
||||
|
||||
/datum/opposing_force_equipment/ammo_exotic/pierce310
|
||||
description = "A box of .310 Strilka Piercing rounds, useful against armored combatants."
|
||||
item_type = /obj/item/ammo_box/c310_cargo_box/piercing
|
||||
|
||||
/datum/opposing_force_equipment/ammo_exotic/magnum
|
||||
description = "A box of magnum flechette shotgun shells, the first choice munition of many shotgun fanatics."
|
||||
item_type = /obj/item/ammo_box/advanced/s12gauge/magnum
|
||||
|
||||
@@ -21,15 +21,15 @@
|
||||
new /obj/item/ammo_box/magazine/c40sol_rifle/standard(src)
|
||||
new /obj/item/ammo_box/magazine/c40sol_rifle/standard(src)
|
||||
|
||||
/datum/opposing_force_equipment/ranged/sakhno
|
||||
name = "Sakhno Precision Rifle"
|
||||
description = "A Sakhno Precision Rifle, a bolt action weapon that was (and certainly still is) popular with frontiersmen, cargo runners, private security forces, explorers, and other unsavoury types. This particular pattern of the rifle dates back all the way to 2440."
|
||||
item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/sakhno
|
||||
/datum/opposing_force_equipment/ranged/miecz
|
||||
name = "'Miecz' Submachinegun"
|
||||
description = "A short barrel, further compacted conversion of the 'Lanca' rifle to fire pistol caliber cartridges."
|
||||
item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/miecz
|
||||
|
||||
/obj/item/storage/toolbox/guncase/skyrat/opfor/sakhno/PopulateContents()
|
||||
new /obj/item/gun/ballistic/rifle/boltaction(src)
|
||||
new /obj/item/ammo_box/strilka310(src)
|
||||
new /obj/item/ammo_box/strilka310(src)
|
||||
/obj/item/storage/toolbox/guncase/skyrat/opfor/miecz/PopulateContents()
|
||||
new /obj/item/gun/ballistic/automatic/miecz(src)
|
||||
new /obj/item/ammo_box/magazine/miecz(src)
|
||||
new /obj/item/ammo_box/magazine/miecz(src)
|
||||
|
||||
/datum/opposing_force_equipment/ranged/kiboko
|
||||
name = "Kiboko Grenade Launcher"
|
||||
@@ -42,14 +42,14 @@
|
||||
new /obj/item/ammo_box/magazine/c980_grenade/drum(src)
|
||||
|
||||
/datum/opposing_force_equipment/ranged/amr
|
||||
name = "Tkach-Tsuneyo AMR"
|
||||
name = "'Wyłom' AMR"
|
||||
description = "A massive, outdated beast of an anti materiel rifle that was once in use by CIN military forces. Fires the devastating .60 Strela caseless round, the massively overperforming penetration of which being the reason this weapon was discontinued."
|
||||
item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/amr
|
||||
|
||||
/obj/item/storage/toolbox/guncase/skyrat/opfor/amr/PopulateContents()
|
||||
new /obj/item/gun/ballistic/automatic/cin_amr(src)
|
||||
new /obj/item/ammo_box/magazine/cin_amr(src)
|
||||
new /obj/item/ammo_box/magazine/cin_amr(src)
|
||||
new /obj/item/gun/ballistic/automatic/wylom(src)
|
||||
new /obj/item/ammo_box/magazine/wylom(src)
|
||||
new /obj/item/ammo_box/magazine/wylom(src)
|
||||
|
||||
/datum/opposing_force_equipment/ranged/lmg
|
||||
name = "L6 SAW LMG"
|
||||
@@ -188,15 +188,25 @@
|
||||
new /obj/item/ammo_box/magazine/m45(src)
|
||||
new /obj/item/ammo_box/magazine/m45(src)
|
||||
|
||||
/datum/opposing_force_equipment/ranged_stealth/nri_pistol
|
||||
name = "Szabo-Ivanek Pistol"
|
||||
description = "A mass produced NRI-made modified reproduction of the Wespe line of handguns rechambered in 9×25mm.'PATRIOT DEFENSE SYSTEMS' is inscribed on the receiver, indicating it's been made with a plasteel printer."
|
||||
item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/nri_pistol
|
||||
/datum/opposing_force_equipment/ranged_stealth/plasma_pistol
|
||||
name = "'Słońce' Plasma Projector"
|
||||
description = "An outdated sidearm rarely seen in use by some members of the CIN. Spews an inaccurate stream of searing plasma out the magnetic barrel so long as it has power and the trigger is pulled."
|
||||
item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/plasma_pistol
|
||||
|
||||
/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/nri_pistol/PopulateContents()
|
||||
new /obj/item/gun/ballistic/automatic/pistol/nri(src)
|
||||
new /obj/item/ammo_box/magazine/m9mm_aps(src)
|
||||
new /obj/item/ammo_box/magazine/m9mm_aps(src)
|
||||
/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/plasma_pistol/PopulateContents()
|
||||
new /obj/item/gun/ballistic/automatic/pistol/plasma_thrower(src)
|
||||
new /obj/item/ammo_box/magazine/recharge/plasma_battery(src)
|
||||
new /obj/item/ammo_box/magazine/recharge/plasma_battery(src)
|
||||
|
||||
/datum/opposing_force_equipment/ranged_stealth/plasma_marksman
|
||||
name = "'Gwiazda' Plasma Sharpshooter"
|
||||
description = "An outdated sidearm rarely seen in use by some members of the CIN. Fires relatively accurate globs of searing plasma."
|
||||
item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/plasma_marksman
|
||||
|
||||
/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/plasma_marksman/PopulateContents()
|
||||
new /obj/item/gun/ballistic/automatic/pistol/plasma_marksman(src)
|
||||
new /obj/item/ammo_box/magazine/recharge/plasma_battery(src)
|
||||
new /obj/item/ammo_box/magazine/recharge/plasma_battery(src)
|
||||
|
||||
/datum/opposing_force_equipment/ranged_stealth/syndie_revolver
|
||||
name = "Syndicate Revolver"
|
||||
|
||||
+7
-5
@@ -6809,8 +6809,6 @@
|
||||
#include "modular_skyrat\modules\company_imports\code\objects\microstar\mcr_attachment_kits.dm"
|
||||
#include "modular_skyrat\modules\company_imports\code\objects\nakamura_modsuits\accretion_incompatibility.dm"
|
||||
#include "modular_skyrat\modules\company_imports\code\objects\nakamura_modsuits\plate_compression_tech.dm"
|
||||
#include "modular_skyrat\modules\company_imports\code\objects\nri_surplus\ak25.dm"
|
||||
#include "modular_skyrat\modules\company_imports\code\objects\nri_surplus\larp_clothing.dm"
|
||||
#include "modular_skyrat\modules\company_imports\code\objects\vitezstvi\ammo_boxes.dm"
|
||||
#include "modular_skyrat\modules\connecting_computer\code\_computer.dm"
|
||||
#include "modular_skyrat\modules\connecting_computer\code\connectable_component.dm"
|
||||
@@ -7176,7 +7174,6 @@
|
||||
#include "modular_skyrat\modules\gunpoint\code\gunpoint.dm"
|
||||
#include "modular_skyrat\modules\gunpoint\code\gunpoint_datum.dm"
|
||||
#include "modular_skyrat\modules\gunsgalore\code\ammo\ammo.dm"
|
||||
#include "modular_skyrat\modules\gunsgalore\code\guns\akm.dm"
|
||||
#include "modular_skyrat\modules\gunsgalore\code\guns\ballistic_master.dm"
|
||||
#include "modular_skyrat\modules\gunsgalore\code\guns\energy.dm"
|
||||
#include "modular_skyrat\modules\gunsgalore\code\guns\fg42.dm"
|
||||
@@ -7597,6 +7594,13 @@
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\grenade.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\pistol.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\carwo_defense_systems\ammo\rifle.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\magazines.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\pistol.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\rifle.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\submachinegun.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\ammo\pistol.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\ammo\plasma.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\szot_dynamica\ammo\rifle.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\trappiste_fabriek\advert.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\trappiste_fabriek\ammo.dm"
|
||||
#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\trappiste_fabriek\gunsets.dm"
|
||||
@@ -7683,7 +7687,6 @@
|
||||
#include "modular_skyrat\modules\nanotrasen_rep\code\nanotrasen_consultant.dm"
|
||||
#include "modular_skyrat\modules\new_cells\code\power_cell.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\advanced_choice_beacon.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\automatic.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\back.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\belt.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\ert.dm"
|
||||
@@ -7695,7 +7698,6 @@
|
||||
#include "modular_skyrat\modules\novaya_ert\code\shield.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\suit.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\surplus_armor.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\surplus_weapons.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\survival_pack.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\toolbox.dm"
|
||||
#include "modular_skyrat\modules\novaya_ert\code\uniform.dm"
|
||||
|
||||
Reference in New Issue
Block a user