Commit Graph

98 Commits

Author SHA1 Message Date
Coolrune206 fb199c82b9 fixes saber spelling (#26766) 2024-09-19 02:26:03 +00:00
CRUNCH 38e393aff3 Extended Descriptions: Energy Weapons - Reloaded! (#25262)
* The Revival

* Added the BSG and disabler SMG

* Minor spelling mistake >::(

* Theta exists.

* Update oldstation.dm

* Maiman Photonics

* Apply suggestions from code review

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/projectiles/guns/energy/energy.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/projectiles/guns/energy/special_eguns.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/projectiles/gun.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* improper nouns

* refactor descriptions

* Documentation + minor refactor

* Refactor descriptions.

* aaaaaaaa

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-05-30 17:53:45 +00:00
Qwertytoforty 50851d7958 fix full auto on certain guns with double click speed (#25520) 2024-05-25 01:18:51 +00:00
Aylong 621127de61 Make some guns REAL auto (#25267)
* The Man Who Sold the World

* UHHHH

* Revert WT full-auto
2024-05-17 12:52:59 +00:00
DGamerL b04bdf4ff9 Adds bullet impact particle effects! (#25177)
* Initial commit

* Cleaning up + more debris

* Adds missing trailing newline

* CI doesn't like these and starts an infinite loop it seems

* Hacky solution? I call it fixing CI

* Final fixes
2024-05-06 19:44:14 +00:00
Luc 1fe7819c1b Ports action button refactor from /tg/ (#24482)
* add the new stuff

* guh

* add the brunt of it

* action button stuff

* adds a lot of other stuff

* careful find and replace

* it loads

* so many huds

* ehh yeah this kinda works

* fixes this runtime

* hacks in some DMI stuff, we'll fix it later

* Adds better mouse pointer for dragging buttons

* gets dragging into place working again, updates DMI

* moves define

* remove extra hud defines, now it compiles

* CHECK GREP

* owww

* rename action defines

* ticks

* are we good

* let's try that again

* renames mob vars

* renames

* fixes some hud issues with huds getting the wrong variable

* fixes some alignment issues

* Adds mouse-wheel scroll support

* left -> right

* I am the entire circus

* first self-review pass

* Another review pass -- just realized I need to fix keybinds

* more testing

* update icons

* oops

* Fix spell icons not appearing properly

* fixes some outstanding issues
- Action button backgrounds now work properly
- Fixes some runtimes on dropping
- Fixes some misplaced icons

* hmm

* weh

* again?

* nah?

* maybe this?

* asdf

* should finally fix CI

* add client check

* move the ?

* add missing override causing runtimes

* shift-clicking now doesn't trigger the button

* better docs
2024-03-24 17:38:53 +00:00
PopeDaveThe3th a2a8293e8c Updates names and descriptions of common ballistics (#24416)
* Updates names and descriptions of common ballistics

* updates WT550 crates, magazines, and ammo boxes

* Update launchers.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update automatic.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update weapon_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-03-10 18:16:42 +00:00
PopeDaveThe3th b8396ee74b Updates the ARG's description (#23035)
* Update's the ARG's description

* Update code/modules/projectiles/guns/projectile/automatic.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-27 20:21:15 +01:00
matttheficus c7ac349f7a Drastically Reduces Execution Time for Handguns + Makes it Weapon-Dependent (#22714)
* its gun time

* magic is fun!

* Update stun.dm
2023-10-20 20:02:28 +01:00
Henri215 33576936dc Adds the AK-814 rifle (#20820)
* Adds the AK-814 rifle

* lets kill another conflict

* Die conflict!
2023-04-22 09:30:14 +02:00
Coolrune206 d559f2ce89 Adds the Security Laser Rifle (#20602)
* security laser rifle

* RnD magazines, yum

* "Hey Drake, where's the req_tech?"

* increases ammo count to 20. flattens magazines.

* RIP small magazines

* fixes it being unprintable, oopsies

* caseless laser rounds
2023-03-26 11:43:19 +01:00
Octus 631fbc7b20 Nerfs the WT-550's size. (#19791)
* i fucking despise IB

* compromise
2022-12-07 21:04:31 -05:00
Stokes52 39b5d3462d Adds new ERT laser carbine item and inhand sprites (#19512) 2022-11-02 21:10:45 +01:00
Vi3trice 20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
moxian e946c0b537 Switch guns and grenades over to /Initialize (#18332) 2022-07-24 11:44:42 +02:00
Bm0n 0e61f8f2ee adds gun counter for wt550 (#18487) 2022-07-22 11:16:48 +01:00
Vi3trice f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
KalevTait 3bd7952ffb guns (#18237) 2022-07-08 09:18:54 +02:00
Bm0n 1d0e3dde0f Updates a considerable amount of legacy weapon sprites to modern TG/Bay versions (#18118)
* test

* holdup

* more guns

* EVEN MORE CHANGES

* fuck

* eugh

* actual shit editor, love DM

* i think I just need inhands now

* final review, test pr

* ooops

* holy shit

* new maka

* foamforce new makarov

* this is going to be hell to review. is it?

* AHHHHH

* small melee fixes

* GOD DAMN STAFF

* as above

* i thought i fixed you, also grip added to wt550 inhand

* acutally deconflicts with the new camera pr, removes the new animated missle(rip)

* some fixes

* a bit more sprite cleaning

* i am suffering

* reverts 9mm

* seemingly forgot a few

* i think we're good now
2022-07-07 17:12:28 +01:00
SabreML 1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906)
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
2021-11-04 19:47:31 +01:00
hal9000PR 3c52cea099 fix (#16728) 2021-09-18 15:36:35 +01:00
variableundefined e4355d7d63 Merge pull request #16529 from chafla/foam-fixes
Ensure only pistol-type weapons can be holstered
2021-08-29 14:47:09 -05:00
chafla 0f0a18c6c7 Set holster default to false 2021-08-12 14:42:36 -07:00
E-MonaRhg 526187fc7b Merge remote-tracking branch 'upstream/master' into gamma_armory_buff_v2 2021-07-08 23:43:41 +02:00
S34N ae6f6148c2 Solgov tweaks (#15896)
* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update
2021-05-16 11:38:16 +01:00
E-MonaRhg 63a904c190 Buffs to gamma armory v2 2021-03-02 15:47:39 +01:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
variableundefined 2c1e443747 Refactor IsHandgun() to a class variable called can_holster 2020-10-15 14:03:04 -04:00
EMPlight 9365120416 Merge branch 'master' into BulldogXLmag 2020-06-27 15:21:59 -07:00
Fox McCloud b3d69aac9b Moves to BYOND 513 (#13650)
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
2020-06-26 01:15:59 -06:00
EMPlight ce2ec83e01 Adds Extended drum mag and bundle for nuke ops. 2020-06-12 22:43:55 -07:00
AffectedArc07 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Fox McCloud 3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
Granodd 6c53564df2 Merge branch 'master' into GunsAndGunAccessories
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
2019-01-26 02:17:22 -05:00
AzuleUtama 8284c56c54 Fixes bulldog and c20's low ammo alarms only going off once 2018-12-12 00:28:45 +00:00
Granodd 8fb45039c0 moved attackby proc to projectiles/guns/projectile.dm 2018-12-02 21:10:20 -05:00
Granodd 9725c7536b Refactors reloading and adds new gun sounds to ballistics 2018-12-02 03:20:05 -05:00
Birdtalon f36b0a4bff changes equip_to_slot_or_del() to equip_or_collect() to prevent item deletion from backpack_contents list
numerous bugfixes
adds new suit sprites
2018-10-07 22:32:44 +01:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
shazbot194 0a9a3c2b2b More icons for the M90 (#8738) 2018-03-19 13:20:31 -07:00
tigercat2000 633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam 2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Mieszko Jędrzejczak e8a04e5524 Laser carbine icons! 2017-02-17 14:21:48 +01:00
FlattestGuitar 692f2d238b Adds a laser carbine!
Admin only for now.
2017-01-26 12:45:36 +01:00
Tigercat2000 56a09db739 Action Button Update
- Refactors action button backend
   - Action buttons are no longer checked on Life(), items are responsible
     for adding/removing/updating them.
   - Item action buttons are no longer a static action_button_name define,
     items define actions_types, which is a list of paths.
   - Items can now have multiple action buttons.
     - This is handled by new arguments to ui_action_click, the first
       parameter is the user, the second is the path of the action datum
       that was invoked.
 - Refactored how internals function
   - You may now directly switch internals without breaking anything.
   - The internals icon has been updated to be more consistent.
 - Added action buttons for jetpacks
 - Added action buttons for oxygen tanks
 - Uses-based implants now qdel() themselves when they run out of uses.
   This is somewhat a buff to traitor implants, but it's such a minor
   change. The actual reasoning is so that the action buttons are properly
   removed.
 - Fixed a bug with the "Boo" spell which resulted in IsAvailable failing
   for certain ghosts.
 - You can now shift-click on movable HUD elements to reset them to the
   proper position (thank fucking christ)
2016-07-18 13:23:01 -07:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
TheDZD 078d7bc099 You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. You switch to semi-automatic. You switch to 1 round burst. 2016-07-05 19:41:44 -04:00
TheDZD c6b4539548 Finishing touches 2016-06-08 15:11:24 -04:00
TheDZD 4facfcb5a4 More fixes and sprites 2016-05-31 22:51:14 -04:00
TheDZD a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00