Skip to content

Commit

Permalink
Removes firing pins and clumsy checks on guns (#2702)
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

Removes firing pins and clumsy checks from guns
<!-- 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 It's Good For The Game

Firing pins and clumsy checks are huge cruft.
Both are designed to limit around things we don't care about anymore
<!-- 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. -->

## Changelog

:cl:
del: Removed firing pins
del: Removed clumsy checks on guns
/: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. -->

---------

Signed-off-by: FalloutFalcon <[email protected]>
  • Loading branch information
FalloutFalcon authored Apr 20, 2024
1 parent 7959a39 commit 29dae13
Show file tree
Hide file tree
Showing 64 changed files with 69 additions and 807 deletions.
5 changes: 1 addition & 4 deletions _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,8 @@
},
/obj/item/gun/energy/lasercannon{
pixel_y = 5;
pin = /obj/item/firing_pin
},
/obj/item/gun/energy/lasercannon{
pin = /obj/item/firing_pin
},
/obj/item/gun/energy/lasercannon,
/obj/effect/turf_decal/industrial/hatch,
/turf/open/floor/plasteel/mono,
/area/ruin/beach/complex)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1324,7 +1324,6 @@
"En" = (
/obj/item/gun/ballistic/automatic/smg/proto,
/obj/structure/rack,
/obj/item/firing_pin,
/turf/open/floor/vault,
/area/ruin/unpowered/corprejectvault)
"Er" = (
Expand Down
3 changes: 0 additions & 3 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2589,9 +2589,6 @@
/obj/structure/railing{
dir = 4
},
/obj/item/firing_pin{
pixel_y = 6
},
/turf/open/floor/plasteel,
/area/ruin/rockplanet/nanotrasen)
"Tl" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
/area/ruin/powered)
"ga" = (
/obj/structure/table/wood/reinforced,
/obj/item/gun/ballistic/automatic/smg/c20r/toy/unrestricted/riot{
/obj/item/gun/ballistic/automatic/smg/c20r/toy/riot{
pixel_x = 5;
pixel_y = 7
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/provinggrounds.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1924,7 +1924,7 @@
"XA" = (
/obj/structure/rack,
/obj/item/ammo_box/foambox/riot,
/obj/item/gun/ballistic/automatic/toy/pistol/riot/unrestricted,
/obj/item/gun/ballistic/automatic/toy/pistol/riot,
/obj/structure/cable{
icon_state = "1-2"
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/singularity_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9120,7 +9120,7 @@
/obj/item/clothing/under/rank/rnd/scientist,
/obj/item/clothing/shoes/sneakers/white,
/obj/effect/gibspawner,
/obj/item/gun/energy/lasercannon/unrestricted{
/obj/item/gun/energy/lasercannon{
desc = "An advanced laser cannon, a laser etched inscription in the handle states 'NT-LS-1013'. The casing is made of a lightweight alloy.";
icon_state = "pulse";
name = "NT-LS-1013"
Expand Down Expand Up @@ -10926,7 +10926,7 @@
"PZ" = (
/obj/effect/turf_decal/box,
/obj/machinery/light/directional/north,
/obj/item/gun/energy/lasercannon/unrestricted{
/obj/item/gun/energy/lasercannon{
desc = "An advanced laser cannon, a laser etched inscription in the handle states 'NT-LS-1013'. The casing is made of a lightweight alloy.";
icon_state = "pulse";
name = "NT-LS-1013"
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 @@ -798,7 +798,7 @@
/turf/open/floor/wood/waste,
/area/ruin/wasteplanet)
"Fn" = (
/obj/item/gun/ballistic/automatic/smg/proto/unrestricted{
/obj/item/gun/ballistic/automatic/smg/proto{
pixel_y = -18
},
/obj/item/ammo_casing/spent{
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5319,7 +5319,7 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"aUp" = (
/obj/item/gun/energy/pulse/carbine/loyalpin,
/obj/item/gun/energy/pulse/carbine,
/obj/item/flashlight/seclite,
/obj/structure/table/reinforced,
/obj/machinery/airalarm/directional/south,
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/unrestricted{
/obj/item/gun/ballistic/automatic/smg/proto{
pixel_y = 3
},
/obj/item/gun/ballistic/automatic/smg/proto/unrestricted{
/obj/item/gun/ballistic/automatic/smg/proto{
pixel_y = -2
},
/obj/item/gun/ballistic/automatic/smg/proto/unrestricted{
/obj/item/gun/ballistic/automatic/smg/proto{
pixel_y = -7
},
/turf/open/floor/plasteel/tech,
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3232,7 +3232,6 @@
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/prisoner,
/obj/item/storage/box/firingpins,
/obj/item/storage/box/seccarts,
/obj/item/storage/box/teargas,
/obj/item/storage/box/zipties,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3115,7 +3115,7 @@
/area/ship/engineering)
"Ha" = (
/obj/structure/closet/secure_closet/lp/lieutenant,
/obj/item/gun/energy/e_gun/mindshield{
/obj/item/gun/energy/e_gun{
pixel_y = 1
},
/obj/item/stock_parts/cell/gun,
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/pirate/pirate_ember.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4019,10 +4019,6 @@
pixel_y = 7;
pixel_x = 4
},
/obj/item/storage/box/firingpins{
pixel_x = -6;
pixel_y = 4
},
/obj/item/storage/box/syndie_kit/throwing_weapons,
/obj/machinery/light/directional/south,
/obj/effect/decal/cleanable/dirt,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/pirate/pirate_noderider.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@
/obj/item/gun/energy/laser/iot,
/obj/item/gun/energy/laser/iot,
/obj/item/gun/energy/e_gun/smg,
/obj/item/gun/energy/lasercannon/unrestricted,
/obj/item/gun/energy/lasercannon,
/obj/item/melee/baton/loaded,
/obj/item/melee/baton/loaded,
/turf/open/floor/plasteel/tech,
Expand Down
5 changes: 1 addition & 4 deletions _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1707,9 +1707,6 @@
},
/obj/machinery/light/directional/north,
/obj/machinery/firealarm/directional/east,
/obj/item/storage/box/firingpins{
pixel_x = -12
},
/turf/open/floor/pod/dark,
/area/ship/security/armory)
"qz" = (
Expand Down Expand Up @@ -2735,7 +2732,7 @@
},
/obj/structure/guncase,
/obj/structure/railing,
/obj/item/gun/ballistic/automatic/smg/c20r/unrestricted,
/obj/item/gun/ballistic/automatic/smg/c20r,
/obj/machinery/light/directional/east,
/turf/open/floor/pod/dark,
/area/ship/security/armory)
Expand Down
2 changes: 1 addition & 1 deletion check_regex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ standards:
- exactly: [1, "/area text paths", '"/area']
- exactly: [17, "/datum text paths", '"/datum']
- exactly: [4, "/mob text paths", '"/mob']
- exactly: [44, "/obj text paths", '"/obj']
- exactly: [43, "/obj text paths", '"/obj']
- exactly: [0, "/turf text paths", '"/turf']
- exactly: [117, "text2path uses", "text2path"]

Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/dcs/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,6 @@

///From /datum/component/creamed/Initialize()
#define COMSIG_MOB_CREAMED "mob_creamed"
///From /obj/item/gun/proc/check_botched()
#define COMSIG_MOB_CLUMSY_SHOOT_FOOT "mob_clumsy_shoot_foot"

///When a carbon mob hugs someone, this is called on the carbon that is hugging. (mob/living/hugger, mob/living/hugged)
#define COMSIG_CARBON_HUG "carbon_hug"
Expand Down
3 changes: 0 additions & 3 deletions code/datums/components/gunpoint.dm
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@
if(weapon.chambered && weapon.chambered.BB)
weapon.chambered.BB.damage *= damage_mult

if(weapon.check_botched(shooter))
return

weapon.process_fire(target, shooter)
qdel(src)

Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/sitcomlaughter.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/component/wearertargeting/sitcomlaughter
valid_slots = list(ITEM_SLOT_HANDS, ITEM_SLOT_BELT, ITEM_SLOT_ID, ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET, ITEM_SLOT_SUITSTORE, ITEM_SLOT_DEX_STORAGE)
signals = list(COMSIG_MOB_CREAMED, COMSIG_ON_CARBON_SLIP, COMSIG_ON_VENDOR_CRUSH, COMSIG_MOB_CLUMSY_SHOOT_FOOT)
signals = list(COMSIG_MOB_CREAMED, COMSIG_ON_CARBON_SLIP, COMSIG_ON_VENDOR_CRUSH)
proctype = PROC_REF(EngageInComedy)
mobtype = /mob/living
///Sounds used for when user has a sitcom action occur
Expand Down
1 change: 0 additions & 1 deletion code/game/gamemodes/clown_ops/clown_ops.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/kitchen/knife/combat/survival,
/obj/item/dnainjector/clumsymut, //in case you want to be clumsy for the memes
/obj/item/storage/box/syndie_kit/clownpins, //for any guns that you get your grubby little clown op mitts on
/obj/item/reagent_containers/spray/waterflower/lube)
implants = list(/obj/item/implant/sad_trombone)

Expand Down
1 change: 0 additions & 1 deletion code/game/machinery/computer/arcade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
visible_message("<span class='notice'>[src] dispenses.. woah, a gun! Way past cool.</span>", "<span class='notice'>You hear a chime and a shot.</span>")
user.client.give_award(/datum/award/achievement/misc/pulse, user)
return

var/prizeselect
if(prize_override)
prizeselect = pickweight(prize_override)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@
/obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle/PopulateContents()
new /obj/item/clothing/shoes/magboots/syndie(src)
new /obj/item/storage/firstaid/tactical(src)
new /obj/item/gun/ballistic/automatic/hmg/l6_saw/toy(src)
new /obj/item/gun/ballistic/automatic/hmg/l6_saw/toy/riot(src)
new /obj/item/ammo_box/foambox/riot(src)

/obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
Expand All @@ -644,7 +644,7 @@
new /obj/item/reagent_containers/spray/chemsprayer/bioterror(src)
new /obj/item/storage/box/syndie_kit/chemical(src)
new /obj/item/gun/syringe/syndicate(src)
new /obj/item/gun/ballistic/automatic/smg/c20r/toy(src)
new /obj/item/gun/ballistic/automatic/smg/c20r/toy/riot(src)
new /obj/item/storage/box/syringes(src)
new /obj/item/ammo_box/foambox/riot(src)
new /obj/item/grenade/chem_grenade/bioterrorfoam(src)
Expand Down
29 changes: 0 additions & 29 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -606,35 +606,6 @@
for(var/i in 1 to 6)
new /obj/item/cartridge/security(src)

/obj/item/storage/box/firingpins
name = "box of standard firing pins"
desc = "A box full of standard firing pins, to allow newly-developed firearms to operate."
icon_state = "secbox"
illustration = "firingpin"

/obj/item/storage/box/firingpins/PopulateContents()
for(var/i in 1 to 5)
new /obj/item/firing_pin(src)

/obj/item/storage/box/firingpins/paywall
name = "box of paywall firing pins"
desc = "A box full of paywall firing pins, to allow newly-developed firearms to operate behind a custom-set paywall."
illustration = "firingpin"

/obj/item/storage/box/firingpins/paywall/PopulateContents()
for(var/i in 1 to 5)
new /obj/item/firing_pin/paywall(src)

/obj/item/storage/box/lasertagpins
name = "box of laser tag firing pins"
desc = "A box full of laser tag firing pins, to allow newly-developed firearms to require wearing brightly coloured plastic armor before being able to be used."
illustration = "firingpin"

/obj/item/storage/box/lasertagpins/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/firing_pin/tag/red(src)
new /obj/item/firing_pin/tag/blue(src)

/obj/item/storage/box/handcuffs
name = "box of spare handcuffs"
desc = "A box full of handcuffs."
Expand Down
16 changes: 3 additions & 13 deletions code/game/objects/items/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

if("metaops")
new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
new /obj/item/gun/ballistic/shotgun/bulldog/unrestricted(src) // 8 tc
new /obj/item/gun/ballistic/shotgun/bulldog(src) // 8 tc
new /obj/item/implanter/explosive(src) // 2 tc
new /obj/item/ammo_box/magazine/m12g(src) // 2 tc
new /obj/item/ammo_box/magazine/m12g(src) // 2 tc
Expand Down Expand Up @@ -165,7 +165,7 @@
new /obj/item/assembly/signaler(src) // 0 tc
new /obj/item/storage/toolbox/syndicate(src) // 1 tc
new /obj/item/pen/edagger(src)
new /obj/item/gun/energy/decloner/unrestricted(src)
new /obj/item/gun/energy/decloner(src)

if("bee")
new /obj/item/paper/fluff/bee_objectives(src) // 0 tc (motivation)
Expand Down Expand Up @@ -306,7 +306,7 @@
/obj/item/storage/box/syndie_kit/imp_radio,
/obj/item/storage/box/syndie_kit/imp_uplink,
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/obj/item/gun/ballistic/automatic/smg/c20r/toy/unrestricted/riot,
/obj/item/gun/ballistic/automatic/smg/c20r/toy/riot,
/obj/item/reagent_containers/hypospray/medipen/stimulants,
/obj/item/storage/box/syndie_kit/imp_freedom,
/obj/item/toy/eightball/haunted
Expand Down Expand Up @@ -370,13 +370,6 @@
for(var/i in 1 to 7)
new /obj/item/reagent_containers/syringe/bioterror(src)

/obj/item/storage/box/syndie_kit/clownpins
name = "ultra hilarious firing pin box"

/obj/item/storage/box/syndie_kit/clownpins/PopulateContents()
for(var/i in 1 to 7)
new /obj/item/firing_pin/clown/ultra(src)

/obj/item/storage/box/syndie_kit/imp_adrenal
name = "adrenal implant box"

Expand Down Expand Up @@ -526,9 +519,6 @@
for(var/i in 1 to 3)
new/obj/item/grenade/chem_grenade/ez_clean(src)

/obj/item/storage/box/hug/reverse_revolver/PopulateContents()
new /obj/item/gun/ballistic/revolver/reverse(src)

/obj/item/storage/box/syndie_kit/mimery/PopulateContents()
new /obj/item/book/granter/spell/mimery_blockade(src)
new /obj/item/book/granter/spell/mimery_guns(src)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@

/obj/structure/closet/secure_closet/armory2/PopulateContents()
..()
new /obj/item/storage/box/firingpins(src)
for(var/i in 1 to 3)
new /obj/item/storage/box/rubbershot(src)
for(var/i in 1 to 3)
Expand All @@ -309,7 +308,6 @@

/obj/structure/closet/secure_closet/armory3/PopulateContents()
..()
new /obj/item/storage/box/firingpins(src)
new /obj/item/gun/energy/ionrifle(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/e_gun(src)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/salvaging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,8 @@
)
/obj/effect/spawner/lootdrop/random_gun_protolathe_lootdrop
loot = list(
/obj/item/gun/energy/lasercannon/unrestricted = 1,
/obj/item/gun/ballistic/automatic/smg/proto/unrestricted = 1,
/obj/item/gun/energy/lasercannon = 1,
/obj/item/gun/ballistic/automatic/smg/proto = 1,
/obj/item/gun/energy/temperature/security = 1,
)
/obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop
Expand Down
11 changes: 0 additions & 11 deletions code/modules/antagonists/abductor/equipment/abduction_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -369,21 +369,10 @@
to_chat(user, "<span class='notice'>You send the message to your target.</span>")
log_directed_talk(user, L, message, LOG_SAY, "abductor whisper")


/obj/item/firing_pin/abductor
name = "alien firing pin"
icon_state = "firing_pin_ayy"
desc = "This firing pin is slimy and warm; you can swear you feel it constantly trying to mentally probe you."
fail_message = "<span class='abductor'>Firing error, please contact Command.</span>"

/obj/item/firing_pin/abductor/pin_auth(mob/living/user)
. = isabductor(user)

/obj/item/gun/energy/alien
name = "alien pistol"
desc = "A complicated gun that fires bursts of high-intensity radiation."
ammo_type = list(/obj/item/ammo_casing/energy/declone)
pin = /obj/item/firing_pin/abductor
icon_state = "alienpistol"
item_state = "alienpistol"
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
Expand Down
2 changes: 1 addition & 1 deletion code/modules/awaymissions/mission_code/snowdin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@
/obj/item/organ/brain/alien = 17,
/obj/item/dualsaber = 15,
/obj/item/organ/heart/demon = 7,
/obj/item/gun/ballistic/automatic/smg/c20r/unrestricted = 16,
/obj/item/gun/ballistic/automatic/smg/c20r = 16,
/obj/item/gun/magic/wand/resurrection/inert = 15,
/obj/item/gun/magic/wand/resurrection = 10,
/obj/item/uplink/old = 2,
Expand Down
2 changes: 0 additions & 2 deletions code/modules/awaymissions/mission_code/stationCollision.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
icon_state = "retro"
desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces."
// projectile_type = "/obj/projectile/practice"
clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face

//Syndicate sub-machine guns.
/obj/item/gun/ballistic/automatic/smg/c20r/sc_c20r
Expand All @@ -68,7 +67,6 @@
/obj/item/gun/energy/laser/practice/sc_laser
name = "Old laser"
desc = "A once potent weapon, years of dust have collected in the chamber and lens of this weapon, weakening the beam significantly."
clumsy_check = 0

/*
* Safe code hints
Expand Down
Loading

0 comments on commit 29dae13

Please sign in to comment.