Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

del old_pirate_guns.dm #13553

Merged
merged 1 commit into from
Sep 29, 2024
Merged

del old_pirate_guns.dm #13553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/datums/outfits/misc/shitspawn.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
back = /obj/item/weapon/storage/backpack/security
l_pocket = /obj/item/weapon/melee/energy/sword
r_pocket = /obj/item/weapon/grenade/empgrenade
belt = /obj/item/weapon/gun/projectile/automatic/silenced
belt = /obj/item/weapon/gun/projectile/automatic/pistol/silenced
KIBORG04 marked this conversation as resolved.
Show resolved Hide resolved

backpack_contents = list(
/obj/item/weapon/storage/box,
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/random/random_guns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
prob(15);/obj/item/weapon/gun/projectile/automatic/pistol/glock,\
prob(15);/obj/item/weapon/gun/projectile/automatic/pistol/stechkin,\
prob(15);/obj/item/weapon/gun/projectile/automatic/pistol/colt1911,\
prob(15);/obj/item/weapon/gun/projectile/automatic/silenced,\
prob(15);/obj/item/weapon/gun/projectile/automatic/pistol/silenced,\
prob(15);/obj/item/weapon/gun/projectile/revolver/peacemaker,\
prob(15);/obj/item/weapon/gun/projectile/revolver/detective,\
prob(5);/obj/item/weapon/gun/projectile/automatic/silenced/nonlethal,\
prob(5);/obj/item/weapon/gun/projectile/automatic/pistol/silenced/nonlethal,\
prob(5);/obj/item/weapon/gun/projectile/revolver/syndie,\
prob(5);/obj/item/weapon/gun/projectile/revolver,\
prob(5);/obj/item/weapon/gun/projectile/automatic/pistol/deagle,\
Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/ammunition/bullets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,11 @@
icon_state = "casing_incendiary"
projectile_type = /obj/item/projectile/bullet/incendiary

/obj/item/ammo_casing/a556/nonlethal
desc = "Патрон для нелетальной пули калибра 5.56 мм."
icon_state = "casing_rubber"
projectile_type = /obj/item/projectile/bullet/weakbullet/nl_rifle

/obj/item/ammo_casing/a74
desc = "Патрон от пули калибра 7.74мм."
caliber = "7.74mm"
Expand Down
12 changes: 12 additions & 0 deletions code/modules/projectiles/ammunition/magazines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,12 @@
overlay = "silenced_pistol-mag"
multiple_sprites = TWO_STATES

/obj/item/ammo_box/magazine/silenced_pistol/nonlethal
name = "magazine (.45NL)"
cases = list("магазин (.45 НЛ)", "магазина (.45 НЛ)", "магазину (.45 НЛ)", "магазин (.45 НЛ)", "магазином (.45 НЛ)", "магазине (.45 НЛ)")
icon_state = "silenced_pistol_mag_nl"
ammo_type = /obj/item/ammo_casing/c45r

/obj/item/ammo_box/magazine/colt
name = "magazine (.45)"
cases = list("магазин (.45)", "магазина (.45)", "магазину (.45)", "магазин (.45)", "магазином (.45)", "магазине (.45)")
Expand Down Expand Up @@ -468,6 +474,12 @@
icon_state = "a28_mag_inc"
overlay = "a28-mag-i"

/obj/item/ammo_box/magazine/a28/nonlethal
name = "A28 magazine (.556NL)"
cases = list("магазин А28 (5.56мм НЛ)", "магазина А28 (5.56мм НЛ)", "магазину А28 (5.56мм НЛ)", "магазин А28 (5.56мм НЛ)", "магазином А28 (5.56мм НЛ)", "магазине А28 (5.56мм НЛ)")
icon_state = "a28_mag_nl"
ammo_type = /obj/item/ammo_casing/a556/nonlethal

/obj/item/ammo_box/magazine/a74
name = "A74 magazine (7.74mm)"
cases = list("магазин А74 (7.74мм)", "магазина А74 (7.74мм)", "магазину А74 (7.74мм)", "магазин А74 (7.74мм)", "магазином А74 (7.74мм)", "магазине А74 (7.74мм)")
Expand Down
10 changes: 9 additions & 1 deletion code/modules/projectiles/guns/projectile/automatic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@

/obj/item/weapon/gun/projectile/automatic/a28
name = "A28 assault rifle"
desc = "Автоматическая винтовка типа булл-пап с воздушным охлаждением, используемая военным корпусом пехоты НаноТрейзен. На ствольной коробке выгравировано - 'Сэр, я заканчиваю этот бой'. Использует патроны калибром 5.56мм."
desc = "Автоматическая винтовка типа булл-пап с воздушным охлаждением, используемая военным корпусом пехоты НаноТрейзен. На ствольной коробке выгравировано - 'Сэр, я заканчиваю этот бой'. Использует патроны калибра 5.56мм."
icon_state = "a28"
item_state = "a28"
w_class = SIZE_SMALL
Expand All @@ -268,6 +268,14 @@
. = ..()
AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)

/obj/item/weapon/gun/projectile/automatic/a28/nonlethal
name = "A28 assault rifle NL"
icon_state = "a28w"
item_state = "a28w"
silenced = TRUE
initial_mag = /obj/item/ammo_box/magazine/a28/nonlethal
fire_sound = 'sound/weapons/guns/gunshot_silencer.ogg'

/obj/item/weapon/gun/projectile/automatic/a74
name = "A74 assault rifle"
desc = "Stradi and Practican Maid Bai Spess soviets corporation, bazed he original design of 20 centuriyu fin about baars and vodka vile patrimonial it, saunds of balalaika place minvile, yuzes 7.74 caliber"
Expand Down
40 changes: 0 additions & 40 deletions code/modules/projectiles/guns/projectile/old_pirate_guns.dm
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions code/modules/projectiles/guns/projectile/pistol.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
suitable_mags = list(/obj/item/ammo_box/magazine/silenced_pistol, /obj/item/ammo_box/magazine/silenced_pistol/nonlethal)
fire_sound = 'sound/weapons/guns/gunshot_silencer.ogg'

/obj/item/weapon/gun/projectile/automatic/pistol/silenced/nonlethal
name = "silenced pistol NL"
icon_state = "silenced_pistol_nl"
initial_mag = /obj/item/ammo_box/magazine/silenced_pistol/nonlethal

/obj/item/weapon/gun/projectile/automatic/pistol/glock
name = "G17"
desc = "Полуавтоматический служебный пистолет калибра 9х19 мм. Предназначен для профессионалов."
Expand Down
4 changes: 4 additions & 0 deletions code/modules/projectiles/projectile/bullets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
/obj/item/projectile/bullet/weakbullet/rubber
name = "rubber bullet"

/obj/item/projectile/bullet/weakbullet/nl_rifle
stutter = 10
agony = 55

/obj/item/projectile/bullet/smg //.45 ACP
damage = 20

Expand Down
2 changes: 1 addition & 1 deletion maps/RandomZLevels/spacebattle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@
/area/awaymission/spacebattle/syndicate1)
"bk" = (
/obj/structure/table/reinforced,
/obj/item/weapon/gun/projectile/automatic/silenced,
/obj/item/weapon/gun/projectile/automatic/pistol/silenced,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
Expand Down
2 changes: 1 addition & 1 deletion maps/RandomZLevels/stationCollision.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
},
/obj/item/clothing/shoes/syndigaloshes,
/obj/effect/decal/cleanable/blood/splatter,
/obj/item/weapon/gun/projectile/automatic/silenced,
/obj/item/weapon/gun/projectile/automatic/pistol/silenced,
/turf/simulated/floor{
icon_state = "grimy"
},
Expand Down
2 changes: 1 addition & 1 deletion maps/RandomZLevels/wildwest.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1828,7 +1828,7 @@
/turf/simulated/floor/wood,
/area/awaymission/wildwest/mines)
"gw" = (
/obj/item/weapon/gun/projectile/automatic/silenced,
/obj/item/weapon/gun/projectile/automatic/pistol/silenced,
/turf/simulated/floor/wood,
/area/awaymission/wildwest/mines)
"gx" = (
Expand Down
4 changes: 2 additions & 2 deletions maps/RandomZLevels/zresearchlabs.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3422,7 +3422,7 @@
"iL" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/gibspawner/human,
/obj/item/weapon/gun/projectile/automatic/silenced{
/obj/item/weapon/gun/projectile/automatic/pistol/silenced{
desc = "A sidearm commonly favored by terrestrial security forces.";
icon_state = "g115 Pistol";
name = "Pistol";
Expand Down Expand Up @@ -8316,7 +8316,7 @@
"tQ" = (
/obj/structure/rack,
/obj/item/ammo_box/c45,
/obj/item/weapon/gun/projectile/automatic/silenced{
/obj/item/weapon/gun/projectile/automatic/pistol/silenced{
desc = "A sidearm commonly favored by terrestrial security forces.";
icon_state = "g115 Pistol";
name = "Pistol";
Expand Down
2 changes: 1 addition & 1 deletion maps/templates/space_structures/space_villa.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@
/turf/simulated/floor/grass,
/area/space_structures/space_villa)
"Gy" = (
/obj/item/weapon/gun/projectile/automatic/silenced,
/obj/item/weapon/gun/projectile/automatic/pistol/silenced,
/obj/effect/decal/turf_decal/set_damaged,
/turf/simulated/floor/plating,
/area/space_structures/space_villa)
Expand Down
1 change: 0 additions & 1 deletion taucetistation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2222,7 +2222,6 @@
#include "code\modules\projectiles\guns\projectile\automatic.dm"
#include "code\modules\projectiles\guns\projectile\bow.dm"
#include "code\modules\projectiles\guns\projectile\launcher.dm"
#include "code\modules\projectiles\guns\projectile\old_pirate_guns.dm"
#include "code\modules\projectiles\guns\projectile\pistol.dm"
#include "code\modules\projectiles\guns\projectile\pneumatic.dm"
#include "code\modules\projectiles\guns\projectile\revolver.dm"
Expand Down
Loading