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

New UPP guns #3865

Merged
merged 39 commits into from
Aug 25, 2023
Merged

New UPP guns #3865

Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
f79f5f4
init
CapCamIII Apr 18, 2023
8c593c7
stuff
CapCamIII May 30, 2023
e87fcfc
i have no idea why i have to commit this but i cant switch branches w…
CapCamIII Jun 2, 2023
2c8bdb0
1
CapCamIII Jun 14, 2023
2adae9e
war
CapCamIII Jun 18, 2023
79db43a
hell
CapCamIII Jun 18, 2023
353456d
hell
CapCamIII Jun 18, 2023
cda2d58
Merge branch 'master' into upp-guns
CapCamIII Jun 19, 2023
6c84ea7
why is attachment sprite code so confusing
CapCamIII Jun 19, 2023
6811424
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
CapCamIII Jun 22, 2023
4185405
fuck it this is now also a REBALANCE PR
CapCamIII Jun 27, 2023
0bd6548
my idea at last
CapCamIII Jun 27, 2023
cc58f21
confusing
CapCamIII Jun 28, 2023
513b048
Merge branch 'master' into upp-guns
CapCamIII Jul 11, 2023
11956f0
vgh
CapCamIII Jul 11, 2023
ce96bf0
checks suck why cant we just merge broken code
CapCamIII Jul 11, 2023
bf31a94
abcdefghijklmnopqrstuvwxyz
CapCamIII Jul 11, 2023
40ed7d5
Hellish
CapCamIII Jul 11, 2023
2944eab
whoever decided to replace the actual error sprites with clown masks …
CapCamIII Jul 19, 2023
5b291eb
Merge branch 'master' into upp-guns
CapCamIII Jul 19, 2023
deb88a3
misinput
CapCamIII Jul 19, 2023
e49d90d
Merge branch 'master' into upp-guns
CapCamIII Jul 26, 2023
13af81b
i hate conflicts aaaaaaaa
CapCamIII Jul 26, 2023
cf2ff8d
why did there have to be a refractor to full auto which forgets the …
CapCamIII Jul 26, 2023
3612f31
since when do duplicate file states fail linters :middle_finger:
CapCamIII Jul 26, 2023
3d5ad6c
Merge branch 'master' into upp-guns
CapCamIII Aug 2, 2023
cfcf5ab
rage
CapCamIII Aug 2, 2023
8ebffc1
Merge branch 'master' into upp-guns
CapCamIII Aug 9, 2023
91c18e7
give it up for MERGE CONFLICT NO. 4, MERGE CONFLICT NUMBER 4
CapCamIII Aug 9, 2023
8a5bcd9
since when are upp survivors a thing
CapCamIII Aug 9, 2023
0d478ff
Merge branch 'master' into upp-guns
CapCamIII Aug 10, 2023
e0e548b
im on the edge
CapCamIII Aug 10, 2023
6b78a46
Merge branch 'master' into upp-guns
CapCamIII Aug 11, 2023
1f28d00
:trollface:
CapCamIII Aug 11, 2023
04f2f87
:+1:
CapCamIII Aug 18, 2023
2b2ba4a
balance
CapCamIII Aug 19, 2023
4efffe8
review + stuff i forgot
CapCamIII Aug 22, 2023
31c3087
:wedding:
CapCamIII Aug 22, 2023
df9d2ca
the time has come
CapCamIII Aug 23, 2023
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
4 changes: 2 additions & 2 deletions code/datums/agents/tools/tranq_gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/weapon/gun/pistol/tranquilizer
name = "Tranquilizer gun"
desc = "Contains horse tranquilizer darts. Useful at knocking people out."
icon = 'icons/obj/items/weapons/guns/guns_by_faction/upp.dmi'
icon = 'icons/obj/items/weapons/guns/guns_by_faction/event.dmi'
icon_state = "pk9r"
item_state = "pk9r"
current_mag = /obj/item/ammo_magazine/pistol/tranq
Expand All @@ -28,7 +28,7 @@
name = "\improper Tranquilizer magazine (Horse Tranquilizer)"
default_ammo = /datum/ammo/bullet/pistol/tranq
caliber = ".22"
icon = 'icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi'
icon = 'icons/obj/items/weapons/guns/ammo_by_faction/event.dmi'
icon_state = "pk-9_tranq"
max_rounds = 5
gun_type = /obj/item/weapon/gun/pistol/tranquilizer
6 changes: 3 additions & 3 deletions code/datums/emergency_calls/upp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@
var/equipment_path = /datum/equipment_preset/upp/specialist
if(heavy_pick)
if(HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY) && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER))
equipment_path = pick(/datum/equipment_preset/upp/specialist, /datum/equipment_preset/upp/minigunner)
equipment_path = pick(/datum/equipment_preset/upp/specialist, /datum/equipment_preset/upp/machinegunner)
else if(HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && !HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY))
equipment_path = /datum/equipment_preset/upp/minigunner
equipment_path = /datum/equipment_preset/upp/machinegunner
arm_equipment(H, equipment_path, TRUE, TRUE)
else if(smartgunners < max_smartgunners && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(H.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
smartgunners++
to_chat(H, SPAN_ROLE_HEADER("You are a sergeant of the Union of Progressive People, a powerful socialist state that rivals the United Americas!"))
arm_equipment(H, /datum/equipment_preset/upp/minigunner, TRUE, TRUE)
arm_equipment(H, /datum/equipment_preset/upp/machinegunner, TRUE, TRUE)
else
to_chat(H, SPAN_ROLE_HEADER("You are a soldier of the Union of Progressive People, a powerful socialist state that rivals the United Americas!"))
arm_equipment(H, /datum/equipment_preset/upp/soldier, TRUE, TRUE)
Expand Down
8 changes: 4 additions & 4 deletions code/datums/factions/clf.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
list("PRIMARY FIREARMS", 0, null, null, null),
list("ABR-40 Hunting Rifle", 30, /obj/item/weapon/gun/rifle/l42a/abr40, null, VENDOR_ITEM_REGULAR),
list("Basira-Armstrong Bolt-Action", 15, /obj/item/weapon/gun/boltaction, null, VENDOR_ITEM_REGULAR),
list("CZ-81 Machine Pistol", 20, /obj/item/ammo_magazine/pistol/skorpion, null, VENDOR_ITEM_REGULAR),
list("Double Barrel Shotgun", 30, /obj/item/weapon/gun/shotgun/double, null, VENDOR_ITEM_REGULAR),
list("HG 37-12 Pump Shotgun", 30, /obj/item/weapon/gun/shotgun/double/sawn, null, VENDOR_ITEM_REGULAR),
list("M16 Rifle", 30, /obj/item/weapon/gun/rifle/m16, null, VENDOR_ITEM_REGULAR),
list("MAR-30 Battle Carbine", 30, /obj/item/weapon/gun/rifle/mar40/carbine, null, VENDOR_ITEM_REGULAR),
list("MAR-40 Battle Rifle", 30, /obj/item/weapon/gun/rifle/mar40, null, VENDOR_ITEM_REGULAR),
list("Type-64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon, null, VENDOR_ITEM_REGULAR),
list("MAC-15 Submachinegun", 20, /obj/item/weapon/gun/smg/mac15, null, VENDOR_ITEM_REGULAR),
list("MP27 Submachinegun", 20, /obj/item/weapon/gun/smg/mp27, null, VENDOR_ITEM_REGULAR),
list("MP5 Submachinegun", 20, /obj/item/weapon/gun/smg/mp5, null, VENDOR_ITEM_REGULAR),
Expand All @@ -48,12 +48,12 @@
list("Box Of Buckshot Shells", 10, /obj/item/ammo_magazine/shotgun/buckshot, null, VENDOR_ITEM_REGULAR),
list("Box Of Flechette Shells", 10, /obj/item/ammo_magazine/shotgun/flechette, null, VENDOR_ITEM_REGULAR),
list("Box Of Shotgun Slugs", 10, /obj/item/ammo_magazine/shotgun, null, VENDOR_ITEM_REGULAR),
list("CZ-81 Magazine (.32ACP)", 5, /obj/item/ammo_magazine/pistol/skorpion, null, VENDOR_ITEM_REGULAR),
list("M16 AP Magazine (5.56x45mm)", 15, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR),
list("M16 Magazine (5.56x45mm)", 5, /obj/item/ammo_magazine/rifle/m16, null, VENDOR_ITEM_REGULAR),
list("MAC-15 Magazine (9mm)", 5, /obj/item/ammo_magazine/smg/mac15, null, VENDOR_ITEM_REGULAR),
list("MAR Magazine (7.62x39mm)", 5, /obj/item/ammo_magazine/rifle/mar40, null, VENDOR_ITEM_REGULAR),
list("MAR Extended Magazine (7.62x39mm)", 15, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR),
list("Type-64 Helical Magazine (.7.62x19mm)", 5, /obj/item/ammo_magazine/smg/bizon, null, VENDOR_ITEM_REGULAR),
list("MP27 Magazine (4.6x30mm)", 5, /obj/item/ammo_magazine/smg/mp27, null, VENDOR_ITEM_REGULAR),
list("MP5 Magazine (9mm)", 5, /obj/item/ammo_magazine/smg/mp5, null, VENDOR_ITEM_REGULAR),

Expand Down Expand Up @@ -99,13 +99,13 @@
list("PRIMARY FIREARMS", -1, null, null),
list("ABR-40 Hunting Rifle", 30, /obj/item/weapon/gun/rifle/l42a/abr40, null, VENDOR_ITEM_REGULAR),
list("Basira-Armstrong Bolt-Action", 15, /obj/item/weapon/gun/boltaction, null, VENDOR_ITEM_REGULAR),
list("CZ-81 Machine Pistol", 20, /obj/item/ammo_magazine/pistol/skorpion, VENDOR_ITEM_REGULAR),
list("Double Barrel Shotgun", 20, /obj/item/weapon/gun/shotgun/double, VENDOR_ITEM_REGULAR),
list("HG 37-12 Pump Shotgun", 20, /obj/item/weapon/gun/shotgun/double/sawn, VENDOR_ITEM_REGULAR),
list("M16 Rifle", 20, /obj/item/weapon/gun/rifle/m16, VENDOR_ITEM_REGULAR),
list("MAC-15 Submachinegun", 20, /obj/item/weapon/gun/smg/mac15, VENDOR_ITEM_REGULAR),
list("MAR-30 Battle Carbine", 20, /obj/item/weapon/gun/rifle/mar40/carbine, VENDOR_ITEM_REGULAR),
list("MAR-40 Battle Rifle", 20, /obj/item/weapon/gun/rifle/mar40, VENDOR_ITEM_REGULAR),
list("Type 64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon, VENDOR_ITEM_REGULAR),
list("MP27 Submachinegun", 20, /obj/item/weapon/gun/smg/mp27, VENDOR_ITEM_REGULAR),
list("MP5 Submachinegun", 20, /obj/item/weapon/gun/smg/mp5, VENDOR_ITEM_REGULAR),
list("Sawn-Off Shotgun", 20, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, VENDOR_ITEM_REGULAR),
Expand All @@ -116,12 +116,12 @@
list("Box Of Buckshot Shells", 15, /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
list("Box Of Flechette Shells", 15, /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
list("Box Of Shotgun Slugs", 15, /obj/item/ammo_magazine/shotgun, VENDOR_ITEM_REGULAR),
list("CZ-81 Magazine (.32ACP)", 60, /obj/item/ammo_magazine/pistol/skorpion, VENDOR_ITEM_REGULAR),
list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, VENDOR_ITEM_REGULAR),
list("M16 Magazine (5.56x45mm)", 60, /obj/item/ammo_magazine/rifle/m16, VENDOR_ITEM_REGULAR),
list("MAC-15 Magazine (9mm)", 60, /obj/item/ammo_magazine/smg/mac15, VENDOR_ITEM_REGULAR),
list("MAR Magazine (7.62x39mm)", 60, /obj/item/ammo_magazine/rifle/mar40, VENDOR_ITEM_REGULAR),
list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, VENDOR_ITEM_REGULAR),
list("Type 64 Helical Magazine (7.62x19mm)", 60, /obj/item/ammo_magazine/smg/bizon, VENDOR_ITEM_REGULAR),
list("MP27 Magazine (4.6x30mm)", 60, /obj/item/ammo_magazine/smg/mp27, VENDOR_ITEM_REGULAR),
list("MP5 Magazine (9mm)", 60, /obj/item/ammo_magazine/smg/mp5, VENDOR_ITEM_REGULAR),

Expand Down
32 changes: 16 additions & 16 deletions code/datums/factions/upp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,24 @@
/datum/faction/upp/get_antag_guns_snowflake_equipment()
return list(
list("PRIMARY FIREARMS", 0, null, null, null),
list("CZ-81 Machine Pistol", 20, /obj/item/weapon/gun/pistol/skorpion/upp, null, VENDOR_ITEM_REGULAR),
list("Type 64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon/upp, null, VENDOR_ITEM_REGULAR),
list("Type 71 Pulse Rifle", 30, /obj/item/weapon/gun/rifle/type71, null, VENDOR_ITEM_REGULAR),
list("Type 71 Pulse Rifle Carbine", 30, /obj/item/weapon/gun/rifle/type71/carbine, null, VENDOR_ITEM_REGULAR),

list("PRIMARY AMMUNITION", 0, null, null, null),
list("CZ-81 Magazine (.32ACP)", 5, /obj/item/ammo_magazine/pistol/skorpion, null, VENDOR_ITEM_REGULAR),
list("Type 64 Helical Magazine (7.62x19mm)", 5, /obj/item/ammo_magazine/smg/bizon, null, VENDOR_ITEM_REGULAR),
list("Type 71 AP Magazine (5.45x39mm)", 15, /obj/item/ammo_magazine/rifle/type71/ap, null, VENDOR_ITEM_REGULAR),
list("Type 71 Magazine (5.45x39mm)", 5, /obj/item/ammo_magazine/rifle/type71, null, VENDOR_ITEM_REGULAR),

list("SIDEARMS", 0, null, null, null),
list("Highpower Automag", 15, /obj/item/weapon/gun/pistol/highpower, null, VENDOR_ITEM_REGULAR),
list("Korovin PK-9 Pistol", 15, /obj/item/weapon/gun/pistol/c99/upp, null, VENDOR_ITEM_REGULAR),
list("N-Y 7.62mm Revolver", 15, /obj/item/weapon/gun/revolver/nagant, null, VENDOR_ITEM_REGULAR),
list("Type 73 Pistol", 25, /obj/item/weapon/gun/pistol/t73, null, VENDOR_ITEM_REGULAR),
list("NP92 Pistol", 15, /obj/item/weapon/gun/pistol/np92, null, VENDOR_ITEM_REGULAR),
list("ZHNK-72 Revolver", 15, /obj/item/weapon/gun/revolver/upp, null, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", 0, null, null, null),
list("Highpower Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/highpower, null, VENDOR_ITEM_REGULAR),
list("N-Y Speed Loader (7.62x38mmR)", 5, /obj/item/ammo_magazine/revolver/upp, null, VENDOR_ITEM_REGULAR),
list("PK-9 Magazine (.22 Hollowpoint)", 5, /obj/item/ammo_magazine/pistol/c99, null, VENDOR_ITEM_REGULAR),
list("Type 73 Magazine (7.62x25mm Tokarev)", 5, /obj/item/ammo_magazine/pistol/t73, null, VENDOR_ITEM_REGULAR),
list("ZHNK-72 Speed Loader (7.62x38mmR)", 5, /obj/item/ammo_magazine/revolver/upp, null, VENDOR_ITEM_REGULAR),
list("NP92 Magazine (9x18mm Makarov)", 40, /obj/item/ammo_magazine/pistol/np92, null, VENDOR_ITEM_REGULAR),

list("ATTACHMENTS", 0, null, null, null),
list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR),
Expand All @@ -86,24 +86,24 @@
/datum/faction/upp/get_antag_guns_sorted_equipment()
return list(
list("PRIMARY FIREARMS", -1, null, null),
list("CZ-81 Machine Pistol", 20, /obj/item/weapon/gun/pistol/skorpion/upp, VENDOR_ITEM_REGULAR),
list("Type 64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon/upp, VENDOR_ITEM_REGULAR),
list("Type 71 Pulse Rifle", 20, /obj/item/weapon/gun/rifle/type71, VENDOR_ITEM_REGULAR),
list("Type 71 Pulse Rifle Carbine", 20, /obj/item/weapon/gun/rifle/type71/carbine, VENDOR_ITEM_REGULAR),

list("PRIMARY AMMUNITION", -1, null, null),
list("CZ-81 Magazine (.32ACP)", 60, /obj/item/ammo_magazine/pistol/skorpion, VENDOR_ITEM_REGULAR),
list("Type 64 Helical Magazine (7.62x19mm)", 60, /obj/item/ammo_magazine/smg/bizon, VENDOR_ITEM_REGULAR),
list("Type 71 AP Magazine (5.45x39mm)", 60, /obj/item/ammo_magazine/rifle/type71/ap, VENDOR_ITEM_REGULAR),
list("Type 71 Magazine (5.45x39mm)", 60, /obj/item/ammo_magazine/rifle/type71, VENDOR_ITEM_REGULAR),

list("SIDEARMS", -1, null, null),
list("Highpower Automag", 20, /obj/item/weapon/gun/pistol/highpower, VENDOR_ITEM_REGULAR),
list("Korovin PK-9 Pistol", 20, /obj/item/weapon/gun/pistol/c99/upp, VENDOR_ITEM_REGULAR),
list("N-Y 7.62mm Revolver", 20, /obj/item/weapon/gun/revolver/nagant, VENDOR_ITEM_REGULAR),
list("Type 73 Pistol", 20, /obj/item/weapon/gun/pistol/t73, VENDOR_ITEM_REGULAR),
list("NP02 Pistol", 20, /obj/item/weapon/gun/pistol/np92, VENDOR_ITEM_REGULAR),
list("ZHNK-72 Revolver", 20, /obj/item/weapon/gun/revolver/upp, VENDOR_ITEM_REGULAR),

list("SIDEARM AMMUNITION", -1, null, null),
list("Highpower Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/highpower, VENDOR_ITEM_REGULAR),
list("N-Y Speed Loader (7.62x38mmR)", 40, /obj/item/ammo_magazine/revolver/upp, VENDOR_ITEM_REGULAR),
list("PK-9 Magazine (.22 Hollowpoint)", 40, /obj/item/ammo_magazine/pistol/c99, VENDOR_ITEM_REGULAR),
list("Type 73 Magazine (7.62x25mm Tokarev)", 40, /obj/item/ammo_magazine/pistol/t73, VENDOR_ITEM_REGULAR),
list("ZHNK-72 Speed Loader (7.62x38mmR)", 40, /obj/item/ammo_magazine/revolver/upp, VENDOR_ITEM_REGULAR),
list("NP92 Magazine (9x18mm Makarov)", 40, /obj/item/ammo_magazine/pistol/np92, VENDOR_ITEM_REGULAR),

list("UTILITIES", -1, null, null),
list("M94 Marking Flare Pack", 20, /obj/item/storage/box/m94, VENDOR_ITEM_RECOMMENDED),
Expand Down
1 change: 1 addition & 0 deletions code/datums/skills.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,7 @@ UNITED PROGRESSIVE PEOPLES
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_JTAC = SKILL_JTAC_EXPERT,
SKILL_EXECUTION = SKILL_EXECUTION_TRAINED,
)
/datum/skills/upp/conscript
name = "UPP Conscript"
Expand Down
88 changes: 51 additions & 37 deletions code/datums/supply_packs/black_market.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,15 @@ Additionally, weapons that are way too good to put in the basically-flavor black
dollar_cost = 5
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/seized/ppsh
name = "PPSh-17b submachinegun crate (x5 magazines included)"
/datum/supply_packs/contraband/seized/pps43
name = "Type-19 submachinegun crate (x5 magazines included)"
contains = list(
/obj/item/weapon/gun/smg/ppsh,
/obj/item/ammo_magazine/smg/ppsh/extended,
/obj/item/ammo_magazine/smg/ppsh/extended,
/obj/item/ammo_magazine/smg/ppsh,
/obj/item/ammo_magazine/smg/ppsh,
/obj/item/ammo_magazine/smg/ppsh,
/obj/item/weapon/gun/smg/pps43,
/obj/item/ammo_magazine/smg/pps43/extended,
/obj/item/ammo_magazine/smg/pps43/extended,
/obj/item/ammo_magazine/smg/pps43,
/obj/item/ammo_magazine/smg/pps43,
/obj/item/ammo_magazine/smg/pps43,
)
dollar_cost = 15
containertype = /obj/structure/largecrate/black_market
Expand Down Expand Up @@ -374,20 +374,34 @@ Additionally, weapons that are way too good to put in the basically-flavor black
dollar_cost = 45
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/seized/c99
name = "Korovin PK-9 pistol crate (x6 magazines included)"
/datum/supply_packs/contraband/seized/np92
name = "NP92 pistol crate (x6 magazines included)"
contains = list(
/obj/item/weapon/gun/pistol/c99,
/obj/item/ammo_magazine/pistol/c99,
/obj/item/ammo_magazine/pistol/c99,
/obj/item/ammo_magazine/pistol/c99,
/obj/item/ammo_magazine/pistol/c99,
/obj/item/ammo_magazine/pistol/c99,
/obj/item/ammo_magazine/pistol/c99,
/obj/item/weapon/gun/pistol/np92,
/obj/item/ammo_magazine/pistol/np92,
/obj/item/ammo_magazine/pistol/np92,
/obj/item/ammo_magazine/pistol/np92,
/obj/item/ammo_magazine/pistol/np92,
/obj/item/ammo_magazine/pistol/np92,
/obj/item/ammo_magazine/pistol/np92,
)
dollar_cost = 5
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/seized/t73
name = "Type 73 pistol crate (x6 magazines included)"
contains = list(
/obj/item/weapon/gun/pistol/t73,
/obj/item/ammo_magazine/pistol/t73,
/obj/item/ammo_magazine/pistol/t73,
/obj/item/ammo_magazine/pistol/t73,
/obj/item/ammo_magazine/pistol/t73,
/obj/item/ammo_magazine/pistol/t73,
/obj/item/ammo_magazine/pistol/t73,
)
dollar_cost = 10
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/seized/kt42
name = "KT-42 Automag pistol (x5 magazines included)"
contains = list(
Expand Down Expand Up @@ -416,14 +430,14 @@ Additionally, weapons that are way too good to put in the basically-flavor black
dollar_cost = 5
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/seized/skorpion
name = "CZ-81 machine pistol (x4 magazines included)"
/datum/supply_packs/contraband/seized/bizon
name = "Type 64 Submachinegun (x4 magazines included)"
contains = list(
/obj/item/weapon/gun/pistol/skorpion,
/obj/item/ammo_magazine/pistol/skorpion,
/obj/item/ammo_magazine/pistol/skorpion,
/obj/item/ammo_magazine/pistol/skorpion,
/obj/item/ammo_magazine/pistol/skorpion,
/obj/item/weapon/gun/smg/bizon,
/obj/item/ammo_magazine/smg/bizon,
/obj/item/ammo_magazine/smg/bizon,
/obj/item/ammo_magazine/smg/bizon,
/obj/item/ammo_magazine/smg/bizon,
)
dollar_cost = 15
containertype = /obj/structure/largecrate/black_market
Expand Down Expand Up @@ -457,10 +471,10 @@ Additionally, weapons that are way too good to put in the basically-flavor black
dollar_cost = 15
containertype = /obj/structure/largecrate/black_market

/datum/supply_packs/contraband/seized/nagant
name = "N-Y 7.62mm revolver (x6 magazines included)"
/datum/supply_packs/contraband/seized/upprevolver
name = "ZHNK-72 revolver (x6 magazines included)"
contains = list(
/obj/item/weapon/gun/revolver/nagant,
/obj/item/weapon/gun/revolver/upp,
/obj/item/ammo_magazine/revolver/upp,
/obj/item/ammo_magazine/revolver/upp,
/obj/item/ammo_magazine/revolver/upp,
Expand Down Expand Up @@ -1068,23 +1082,23 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro
new picked_type(loc)
loot_message = SPAN_NOTICE("It's some strange elite gear...?")
if(11 to 15)
//Skorpion
new /obj/item/weapon/gun/pistol/skorpion(loc)
new /obj/item/ammo_magazine/pistol/skorpion(loc)
new /obj/item/ammo_magazine/pistol/skorpion(loc)
new /obj/item/ammo_magazine/pistol/skorpion(loc)
//Type 64
new /obj/item/weapon/gun/smg/bizon(loc)
new /obj/item/ammo_magazine/smg/bizon(loc)
new /obj/item/ammo_magazine/smg/bizon(loc)
new /obj/item/ammo_magazine/smg/bizon(loc)
// Somehow they found a Webley.
new /obj/item/weapon/gun/revolver/m44/custom/webley(loc)
new /obj/item/ammo_magazine/revolver/webley(loc)
new /obj/item/ammo_magazine/revolver/webley(loc)
new /obj/item/ammo_magazine/revolver/webley(loc)
loot_message = SPAN_NOTICE("It's some CLF pistol armaments!")
if(16 to 20)
// PPSH
new /obj/item/weapon/gun/smg/ppsh/with_drum_mag(loc)
new /obj/item/ammo_magazine/smg/ppsh/extended(loc)
new /obj/item/ammo_magazine/smg/ppsh/extended(loc)
new /obj/item/ammo_magazine/smg/ppsh/extended(loc)
// Type 19
new /obj/item/weapon/gun/smg/pps43/extended_mag(loc)
new /obj/item/ammo_magazine/smg/pps43/extended(loc)
new /obj/item/ammo_magazine/smg/pps43/extended(loc)
new /obj/item/ammo_magazine/smg/pps43/extended(loc)
// MAC-15
new /obj/item/weapon/gun/smg/mac15/extended(loc)
new /obj/item/ammo_magazine/smg/mac15/extended(loc)
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/vending/vendor_types/antag/antag_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@

/obj/effect/essentials_set/upp_heavy
spawned_gear_list = list(
/obj/item/weapon/gun/minigun/upp,
/obj/item/ammo_magazine/minigun,
/obj/item/ammo_magazine/minigun,
/obj/item/weapon/gun/pkp,
/obj/item/ammo_magazine/pkp,
/obj/item/ammo_magazine/pkp,
)

/obj/effect/essentials_set/leader/upp
Expand Down
3 changes: 1 addition & 2 deletions code/game/objects/effects/spawners/random.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@
/obj/item/weapon/gun/revolver/small = /obj/item/ammo_magazine/revolver/small,
/obj/item/weapon/gun/pistol/heavy = /obj/item/ammo_magazine/pistol/heavy,
/obj/item/weapon/gun/pistol/skorpion = /obj/item/ammo_magazine/pistol/skorpion,
/obj/item/weapon/gun/pistol/skorpion/upp = /obj/item/ammo_magazine/pistol/skorpion,
)

/obj/effect/spawner/random/gun/pistol/lowchance
Expand Down Expand Up @@ -494,7 +493,7 @@
/obj/item/weapon/gun/smg/mp27 = /obj/item/ammo_magazine/smg/mp27,
/obj/item/weapon/gun/smg/mp27 = /obj/item/ammo_magazine/smg/mp27,
/obj/item/weapon/gun/smg/mp27 = /obj/item/ammo_magazine/smg/mp27,
/obj/item/weapon/gun/smg/ppsh = /obj/item/ammo_magazine/smg/ppsh,
/obj/item/weapon/gun/smg/pps43 = /obj/item/ammo_magazine/smg/pps43,
/obj/item/weapon/gun/smg/mac15 = /obj/item/ammo_magazine/smg/mac15,
/obj/item/weapon/gun/smg/mac15 = /obj/item/ammo_magazine/smg/mac15,
/obj/item/weapon/gun/smg/uzi = /obj/item/ammo_magazine/smg/uzi,
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/shards.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,13 +232,13 @@
organ.take_damage(damage_on_move * count, 0, 0, no_limb_loss = TRUE)
embedded_mob.pain.apply_pain(damage_on_move * count)

/obj/item/shard/shrapnel/nagant
/obj/item/shard/shrapnel/upp
name = "small shrapnel"
desc = "Some shrapnel that used to be embedded underneath someone's skin."
icon_state = "small"
damage_on_move = 2

/obj/item/shard/shrapnel/nagant/bits
/obj/item/shard/shrapnel/upp/bits
name = "tiny shrapnel"
desc = "A tiny piece of shrapnel that used to be embedded underneath someone's skin."
icon_state = "tiny"
Expand Down
Loading