-
-
Notifications
You must be signed in to change notification settings - Fork 285
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
A Pellet Gun! A Recreational rifle for Civilians. (#6628)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## Civilian Shooting Made Easy! Many characters on the server may be from societies where firearms are restricted (after all not everyone has a military backstory) or otherwise come from peaceful planets. Now living in the dangerous frontier, they may want to learn to shoot. However, very reasonably the environment of the station restricts access to firearms. A pellet gun provides them the opportunity to learn the basics of ballistic firearms operation without needing security to look over their shoulder. This PR adds a simple pellet gun and an outdoor range to Atlas. Security can hand out the pellet guns without worry they may be misused. Civilians can freely use the pellet guns for recreational purposes or training. The outdoor range also provides a no-access required public-use facility for shooting. The station starts with four pellet guns and four pellet boxes stored in the security entrance checkpoint in plain-view locker. They simply need someone with sec access to unlock it and hand it off to people. Single ones can also be ordered from cargo. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why Not Just Use Donk Soft Guns? Mechanically not much different but aesthetically/in character they are. In Character, most people see the brightly colored toy dart gun much differently from a pellet shooter which resembles a real weapon, NT probably thinks so too. Consider this, in terms of RP, the middle step between a character learning to shoot a dart gun versus beginning to use a real one. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## 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. --> :cl: add: a pellet gun and associated icons. add: two new hangable targets that don't look like people /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: 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. -->
- Loading branch information
1 parent
896f75f
commit e4e31a0
Showing
13 changed files
with
513 additions
and
205 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
code/modules/projectiles/guns/projectile/caseless/pellet.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/////////////////////////////////////// | ||
// Pellet Gun - For Recerational Use // | ||
/////////////////////////////////////// | ||
|
||
#define DEFINE_CALIBER_PELLET 804 | ||
|
||
/obj/item/gun/ballistic/caseless/pellet | ||
name = "pellet gun" | ||
desc = "An air powered rifle that shoots near harmless plastic pellets. Used for recreation in enviroments where firearm ownership is restricted." | ||
icon = 'icons/obj/gun/ballistic/caseless/pellet.dmi' | ||
icon_state = "pellet" | ||
item_state = "pellet" | ||
wielded_item_state = "pellet-wielded" | ||
caliber = "pellet" | ||
fire_sound = 'sound/weapons/tap.ogg' | ||
max_shells = 1 | ||
ammo_type = /obj/item/ammo_casing/p_pellet | ||
load_method = SINGLE_CASING | ||
item_icons = list("left_hand" = 'icons/mob/items/lefthand_guns.dmi', "right_hand" = 'icons/mob/items/righthand_guns.dmi') | ||
|
||
/obj/item/ammo_casing/p_pellet | ||
name = "pellet" | ||
desc = "Also know as a BB, it is shot from airguns for recreational shooting." | ||
icon = 'icons/obj/gun/ballistic/caseless/pellet.dmi' | ||
caliber = "pellet" | ||
icon_state = "pellet_single" | ||
projectile_type = /obj/projectile/bullet/practice | ||
casing_flags = CASING_DELETE | ||
|
||
/obj/item/ammo_magazine/pellets | ||
name = "box of pellets" | ||
desc = "A box containing small pellets for a pellet gun." | ||
icon = 'icons/obj/gun/ballistic/caseless/pellet.dmi' | ||
icon_state = "pelletbox" | ||
caliber = "pellet" | ||
mag_type = MAGAZINE | ||
ammo_type = /obj/item/ammo_casing/p_pellet | ||
materials_base = list(MAT_PLASTIC = 600) | ||
max_ammo = 50 | ||
multiple_sprites = 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.