cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
parent ae8d35f963 5fdb6d3618
commit b308ee9d78
313 changed files with 6548 additions and 4624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/uplink/uplink_items/ammunition.dm
+1 -1
View File
@@ -51,7 +51,7 @@
name = ".357 Speed Loader"
desc = "A speed loader that contains seven additional .357 Magnum rounds; usable with the Syndicate revolver. \
For when you really need a lot of things dead."
item = /obj/item/ammo_box/a357
item = /obj/item/ammo_box/speedloader/c357
cost = 4
purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) //nukies get their own version
uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
code/modules/uplink/uplink_items/nukeops.dm
+3 -3
View File
@@ -218,7 +218,7 @@
name = ".357 Speed Loader (Revolver)"
desc = "A speed loader that contains seven additional .357 Magnum rounds; usable with the Syndicate revolver. \
For when you really need a lot of things dead. Unlike field agents, operatives get a premium price for their speedloaders!"
item = /obj/item/ammo_box/a357
item = /obj/item/ammo_box/speedloader/c357
purchasable_from = parent_type::purchasable_from | UPLINK_SPY
/datum/uplink_item/ammo_nuclear/special/revolver/phasic
@@ -226,7 +226,7 @@
desc = "A speed loader that contains seven additional .357 Magnum phasic rounds; usable with the Syndicate revolver. \
These bullets are made from an experimental alloy, 'Ghost Lead', that allows it to pass through almost any non-organic material. \
The name is a misnomer. It doesn't contain any lead whatsoever!"
item = /obj/item/ammo_box/a357/phasic
item = /obj/item/ammo_box/speedloader/c357/phasic
purchasable_from = parent_type::purchasable_from | UPLINK_SPY
/datum/uplink_item/ammo_nuclear/special/revolver/heartseeker
@@ -234,7 +234,7 @@
desc = "A speed loader that contains seven additional .357 Magnum heartseeker rounds; usable with the Syndicate revolver. \
Able to veer straight into targets! Don't miss a shot with heartseeker! As seen in the hit NTFlik horror-space western film, Forget-Me-Not! \
Brought to you by Roseus Galactic!"
item = /obj/item/ammo_box/a357/heartseeker
item = /obj/item/ammo_box/speedloader/c357/heartseeker
cost = 3
purchasable_from = parent_type::purchasable_from | UPLINK_SPY