cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-23 15:36:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

caseless rifle bonanza (#6425)

Browse Source 
## About The Pull Request

PR related to a ore thing about rifles/etc. the objective of these guns
is gonna be as ultrarare loot/asset protection/ert stuff. basically this
is just the ballistic equivalents to the pulse rifle.

so far - gorlex Wild Hunt rifle, 100% AP (not extra damage vs armored
though), 50 brute, sets on fire


![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/54826962/bb84cccf-e2fc-4c72-8963-37f9a3b4673e)

also adds a generic new sprite - purple boolet


![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/54826962/4d582f63-a1b5-43f3-a121-d319983e7773)


todo: sprites


## Why It's Good For The Game

gun and lore fun.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: caseless rifles
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
This commit is contained in:
bearrrrrrrr
2024-05-23 02:31:15 -07:00
committed by GitHub
parent 15ee89df66
commit fc55e4ed6e
9 changed files with 143 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/guns_and_ammo.dm
+25 -14
View File
@@ -95,6 +95,8 @@
prob(1);/obj/item/gun/ballistic/shotgun/pump/rifle/taj,
prob(1);/obj/item/gun/ballistic/shotgun/pump/rifle/lever,
prob(1);/obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895,
prob(1);/obj/item/gun/ballistic/caseless/phoron_spitter,
prob(1);/obj/item/gun/ballistic/caseless/wild_hunt,
prob(2);/obj/item/gun/ballistic/silenced)
/obj/random/projectile/sec
@@ -188,39 +190,43 @@
/obj/random/multiple/gun/projectile/smg/item_to_spawn()
return pick(
prob(3);list(
prob(6);list(
/obj/item/gun/ballistic/automatic/wt550,
/obj/item/ammo_magazine/m9mmt,
/obj/item/ammo_magazine/m9mmt
),
prob(3);list(
prob(6);list(
/obj/item/gun/ballistic/automatic/wt274,
/obj/item/ammo_magazine/m45uzi/wt274,
/obj/item/ammo_magazine/m45uzi/wt274
),
prob(1);list(
prob(2);list(
/obj/item/gun/ballistic/automatic/mini_uzi,
/obj/item/ammo_magazine/m45uzi,
/obj/item/ammo_magazine/m45uzi
),
prob(1);list(
prob(2);list(
/obj/item/gun/ballistic/automatic/tommygun,
/obj/item/ammo_magazine/m45tommy,
/obj/item/ammo_magazine/m45tommy
),
prob(2);list(
prob(4);list(
/obj/item/gun/ballistic/automatic/c20r,
/obj/item/ammo_magazine/m10mm,
/obj/item/ammo_magazine/m10mm
),
prob(1);list(
prob(2);list(
/obj/item/gun/ballistic/automatic/p90,
/obj/item/ammo_magazine/m57x28mmp90
),
prob(1);list(
prob(2);list(
/obj/item/gun/ballistic/automatic/mini_uzi/taj,
/obj/item/ammo_magazine/m45uzi,
/obj/item/ammo_magazine/m45uzi
),
prob(1);list(
/obj/item/gun/ballistic/caseless/phoron_spitter,
/obj/item/ammo_magazine/mphoronshot
)
)
@@ -234,36 +240,41 @@
/obj/random/multiple/gun/projectile/rifle/item_to_spawn()
return pick(
prob(2);list(
prob(4);list(
/obj/item/gun/ballistic/automatic/sts35,
/obj/item/ammo_magazine/m556,
/obj/item/ammo_magazine/m556
),
prob(2);list(
prob(4);list(
/obj/item/gun/ballistic/automatic/z8,
/obj/item/ammo_magazine/m762,
/obj/item/ammo_magazine/m762
),
prob(4);list(
prob(8);list(
/obj/item/gun/ballistic/shotgun/pump/rifle,
/obj/item/ammo_magazine/clip/c762,
/obj/item/ammo_magazine/clip/c762
),
prob(1);list(
prob(2);list(
/obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895,
/obj/item/ammo_magazine/clip/c762,
/obj/item/ammo_magazine/clip/c762
),
prob(1);list(
prob(2);list(
/obj/item/gun/ballistic/automatic/bullpup,
/obj/item/ammo_magazine/m762,
/obj/item/ammo_magazine/m762
),
prob(4);list(
prob(8);list(
/obj/item/gun/ballistic/shotgun/pump/rifle/taj,
/obj/item/ammo_magazine/clip/c762,
/obj/item/ammo_magazine/clip/c762
)
),
prob(1);list(
/obj/item/gun/ballistic/caseless/wild_hunt,
/obj/item/ammo_magazine/mfiftycalcaseless,
/obj/item/ammo_magazine/mfiftycalcaseless
),
)
/obj/random/multiple/gun/projectile/handgun