Skip to content

Commit

Permalink
Small gun changes (#3048)
Browse files Browse the repository at this point in the history
<!-- 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. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Makes the combat shotgun bulky instead of huge, and the compact combat
shotgun medium instead of bulky

Repaths the saber SMG to be a child of the skm carbine so the stock is
able to fold and changes

Adds automatic fire to the TEC-9 and makes it normal sized.

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

The combat shotgun being huge is a holdover from station based server
balance. It being bulky now will make it be able to fit in armor vests.
Moves the compact combat shotgun down to normal as a result since it's
supposed to be the compact version.

The Saber and TEC-9 changes are so they're accurate to their
descriptions of having a folding stock and having a fast rate of fire
respectively. Ups the TEC-9 to normal sized as a result since having an
automatic pistol you can fit in your boot is probably not good.

## Changelog

:cl:

tweak: Saber SMG stock folds
tweak: TEC-9 Pistol is now automatic and normal sized
balance: Combat shotgun is now bulky, and the compact combat shotgun is
normal.
/: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
Gristlebee authored Jun 26, 2024
1 parent bbc5790 commit d1e86af
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2716,7 +2716,7 @@
/obj/item/ammo_box/magazine/smgm9mm{
start_empty = 1
},
/obj/item/gun/ballistic/automatic/smg/proto,
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
/turf/open/floor/plasteel/dark,
/area/ruin/lavaland/factory/dorms)
"zC" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@
/turf/open/floor/wood/waste,
/area/ruin/wasteplanet)
"Fn" = (
/obj/item/gun/ballistic/automatic/smg/proto{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
pixel_y = -18
},
/obj/item/ammo_casing/spent{
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3374,13 +3374,13 @@
"mt" = (
/obj/structure/window/reinforced/spawner,
/obj/structure/rack,
/obj/item/gun/ballistic/automatic/smg/proto{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
pixel_y = 3
},
/obj/item/gun/ballistic/automatic/smg/proto{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
pixel_y = -2
},
/obj/item/gun/ballistic/automatic/smg/proto{
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto{
pixel_y = -7
},
/turf/open/floor/plasteel/tech,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/salvaging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
/obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop
loot = list(
/obj/item/gun/energy/lasercannon = 1,
/obj/item/gun/ballistic/automatic/smg/proto = 1,
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 1,
/obj/item/gun/energy/temperature/security = 1,
)
/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
/datum/blackmarket_item/weapon/saber_smg
name = "Saber 9mm SMG"
desc = "A prototype 9mm submachine gun. Most of these never got past the RND phase and into distribution. But we happen know a guy."
item = /obj/item/gun/ballistic/automatic/smg/proto
item = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto
pair_item = /datum/blackmarket_item/weapon/saber_mag

price_min = 2500
Expand Down
6 changes: 5 additions & 1 deletion code/modules/projectiles/guns/ballistic/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,19 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
name = "\improper TEC-9 machine pistol"
desc = "A crude machine pistol designed to vomit 9mm ammunition at a truly eye-watering rate of fire."
icon_state = "tec9"
fire_delay = 0.15 SECONDS
weapon_weight = WEAPON_LIGHT
w_class = WEIGHT_CLASS_SMALL
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/tec9
show_magazine_on_sprite = TRUE
load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'

gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
default_firemode = FIREMODE_SEMIAUTO

/obj/item/gun/ballistic/automatic/pistol/disposable
name = "disposable gun"
desc = "An exceedingly flimsy plastic gun that is extremely cheap to produce. You get what you pay for."
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,14 @@
item_state = "shotgun_combat"
fire_delay = 0.5 SECONDS
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
w_class = WEIGHT_CLASS_HUGE
w_class = WEIGHT_CLASS_BULKY

/obj/item/gun/ballistic/shotgun/automatic/combat/compact
name = "compact combat shotgun"
desc = "A compact version of the semi-automatic combat shotgun. For close encounters."
icon_state = "cshotgunc"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
w_class = WEIGHT_CLASS_BULKY
w_class = WEIGHT_CLASS_NORMAL
weapon_weight = WEAPON_MEDIUM

//Dual Feed Shotgun
Expand Down
23 changes: 12 additions & 11 deletions code/modules/projectiles/guns/ballistic/smg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,6 @@
. = total_spread
return ..()

/obj/item/gun/ballistic/automatic/smg/proto
name = "\improper Nanotrasen Saber SMG"
desc = "A prototype full-auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock."
icon_state = "saber"
actions_types = list()
mag_type = /obj/item/ammo_box/magazine/smgm9mm

bolt_type = BOLT_TYPE_LOCKING
show_magazine_on_sprite = TRUE
manufacturer = MANUFACTURER_NANOTRASEN_OLD

/obj/item/gun/ballistic/automatic/smg/c20r
name = "\improper C-20r SMG"
desc = "A bullpup .45 SMG designated 'C-20r.' Its buttstamp reads 'Scarborough Arms - Per falcis, per pravitas.'"
Expand Down Expand Up @@ -409,3 +398,15 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)

unfolded_slowdown = 0.35
unfolded_wield_delay = 0.4 SECONDS

/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto
name = "\improper Nanotrasen Saber SMG"
desc = "A prototype full-auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "saber"
item_state = "gun"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
bolt_type = BOLT_TYPE_LOCKING
show_magazine_on_sprite = TRUE
manufacturer = MANUFACTURER_NANOTRASEN_OLD

2 changes: 1 addition & 1 deletion code/modules/spells/spell_types/rightandwrong.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/energy/lasercannon,
/obj/item/gun/energy/kinetic_accelerator/crossbow/large,
/obj/item/gun/energy/e_gun/nuclear,
/obj/item/gun/ballistic/automatic/smg/proto,
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
/obj/item/gun/ballistic/automatic/smg/c20r,
/obj/item/gun/ballistic/automatic/hmg/l6_saw,
/obj/item/gun/ballistic/automatic/smg/m90,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vending/liberation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
/obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2,
/obj/item/gun/ballistic/automatic/pistol/candor = 2,
/obj/item/gun/ballistic/automatic/smg/proto = 2,
/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto = 2,
/obj/item/gun/ballistic/shotgun/automatic/combat = 2,
/obj/item/gun/ballistic/automatic/gyropistol = 1,
/obj/item/gun/ballistic/shotgun = 2)
Expand Down
Binary file modified icons/mob/inhands/weapons/guns_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/weapons/guns_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/guns/projectile.dmi
Binary file not shown.

0 comments on commit d1e86af

Please sign in to comment.