Commit Graph
47 Commits
Author SHA1 Message Date
e657597b1c [LORE] Replaces most uses of "Russian" with "Soviet" (#26822)
* no russian

* space

* more spaces

* Update walls_mineral.dm

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

* Update space_ruins.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2024-10-10 09:57:42 +00:00
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
matttheficusandGitHub 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
348c14f736 Makes gun reskins use a radial menu instead of a input menu (#22682)
* input to radial

* hands blocked trait instead of incapacitated

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* remove null parameter

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* rename reskin radial proc

* fix

* shorten code

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-09 20:38:41 +01:00
4c13246d30 Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5 (#19170)
* Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5

* grammer / typeblock

* 15 is not more than 15

* how did I miss this, I swear I put in 3

* path + crafting

* Update code/modules/crafting/guncrafting.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-14 08:28:07 +02:00
Bm0nandGitHub a78c1e9f12 Adds the Stechkin APS to the nukeop uplink (#18741)
* addAPS

* fixes HP ammo sprite

* hah i forgot the uplink refs

* surplus = 40
2022-08-10 14:21:51 +01:00
moxianandGitHub e946c0b537 Switch guns and grenades over to /Initialize (#18332) 2022-07-24 11:44:42 +02:00
Vi3triceandGitHub 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
KalevTaitandGitHub 3bd7952ffb guns (#18237) 2022-07-08 09:18:54 +02:00
Bm0nandGitHub 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
SabreMLandGitHub 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
variableundefined 2c1e443747 Refactor IsHandgun() to a class variable called can_holster 2020-10-15 14:03:04 -04:00
AffectedArc07andGitHub 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
Granodd 6c53564df2 Merge branch 'master' into GunsAndGunAccessories
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
2019-01-26 02:17:22 -05:00
Granodd 9725c7536b Refactors reloading and adds new gun sounds to ballistics 2018-12-02 03:20:05 -05:00
shazbot194 939cefcca0 Updates Enforcers 2018-08-22 18:48:01 -08:00
Fox McCloud 6c9f83f685 Stechkin Maintenance Pistol Change 2018-06-30 19:24:56 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
shazbot194 02bc43b20e Small sprite update
Changes in description
2017-07-28 23:43:34 -08:00
shazbot194 8fcf5e0cec Now with lights
LIGHT
2017-07-26 19:26:51 -08:00
shazbot194 e2415a74f6 Adds in more colors, suppresors, and a trainer
read desc for more deteails.
2017-07-25 14:29:41 -08:00
shazbot194 2401d28895 New enforcer sprites
adds in new enforcer sprites
2017-07-24 20:56:21 -08: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
Alffd a6b916fc92 Makes the description generic. 2017-01-16 00:14:30 -05:00
Alffd 3fbc81cea7 Ports Enforcer handgun, rubber bullets, and new ammoboxes. 2017-01-15 21:13:22 -05: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
FreeStylaLT f7949d77e1 i have no clue what i did here but it made me make a commit so 2016-06-16 21:42:58 +03:00
FreeStylaLT 765d0ddca9 goodies only pistols, no list yet 2016-06-15 02:55:48 +03:00
TheDZD c6b4539548 Finishing touches 2016-06-08 15:11:24 -04:00
TheDZD 95d7a68a75 Here we go again... 2016-05-31 22:50:53 -04:00
Markolie 6f0a8174ad Guns rename, take two 2015-09-30 15:51:14 +02:00
Markolie f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
DZD a93ef4dd1b The Return of the Shoulder Holster
- Detective's shoulder holster now only fits projectile-based (not
energy) handguns.
- Swaps the detective's belt holster for the old shoulder holster.
- Makes some specific handguns actually fit inside of holsters.

- Unrelated: Removes a debug output from
/code/modules/power/singularity/generator.dm
2015-01-29 13:23:46 -05:00
Fox-McCloud 8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
SamCroswell ceabc46f1b Dismemberment Update, Fire Axe Fixes, Gun Sounds 2014-11-23 00:52:32 -05:00
SamCroswell 90bb1c5861 Weapon description update
Updated a few weapon descriptions to fit properly.
2014-11-22 13:33:25 -05:00
SamCroswell 521467fa3e C4 now explodes on detonation, Stechtkin pistol fix
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
2014-05-04 02:28:06 -04:00
SamCroswell bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
ZomgPonies d4055a89af Buckshot whee! 2013-12-12 22:10:33 -05:00
ZomgPonies 7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -04:00
petethegoat@gmail.com fd9f6490f1 Updated listeningpost.dmm to look nicer and be a bit more interesting.
Updated the Stechtkov pistol. Should be pretty solid now.
Made a returning ex_act for snow floors.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5182 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 17:38:24 +00:00
petethegoat@gmail.com c6b8a3b009 Fixed some L6 issues.
Added a pistol that can be silenced for future nuke op use.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5138 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 18:57:14 +00:00
Kortgstation@gmail.com abb7be68ea Gyropistol now uses magazines.
New Gyropistol and Gyropistol magazine sprites by Ausops.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4602 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 19:44:06 +00:00
elly1989@rocketmail.com 4073ac9b00 Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.
All credits to the author for this handy little script.
I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work.

To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders"

If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-18 16:33:40 +00:00
kortgstation@gmail.com 3a96667003 Desert Eagles now use magazines, .50AE ammo, and only have 7 shots. They're basically revolvers that use magazines.
Nuke ops lost that horribly nerfed piece of shit c20r and now get Desert Eagles and Riot Shields.

The detectives .38 ammo now does the same damage as regular revolver bullets. If he wants to keep acting as a glorified sec officer, he can go grab a taser.

The Veil Render now summons a subtype of Nar-Sie which doesn't pull anchored objects. This should reduce the power of the item/reduce lag while I get sprites and finalize details with Urist for reworking it as the Sphere of Annihilation (as in, this is temporary)

Updated the changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3132 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-16 07:20:32 +00:00
mport2004@gmail.com 62e28c2abf Organs:
Moved into their own folder and got split into three files.
Damage  zones have been regrouped slightly to make it easier to deal with them. Currently the organ groups are head, l/r leg, l/r arm, and head.

Attacking:
Armor is properly checked.
Currently aiming for the chest gives a higher chance to stun whereas the head will stun for longer.
Stungloves/Disarm now show up in the attack log.
Stungloves ignore intent.

Silicon:
AI units can now move between cams that are not on the ss13 network.
Cyborg's alert screen should not longer pop up every time they get an alert if they have opened it once during the round.
Robot vision now uses the standard amount of energy.

Gamemodes:
Added Deuryn's unrev message.
Runes can only be examined if you are close to them.
Moved the Loyalty implants to the HoS' locker at the request of HerpA.
Nuke agents now come with explosive implants that will activate upon death.

Projectiles:
Once again went though the gun code and cleaned things up, it is much better now.
Bullet_act fixed up and most mobs now use the one in living, just overload it if they need to do something diff.
Freeze /caplaser/xbow no longer have an infinite loop.
Shotguns have to be pumped manually.

Went though the latest runtime log.

Power cells now use return on their give/use procs

Assemblies have been reworked and are nearly finished, just need to finish up the special assembly code, redo the signalers, and add one or two new assembly items.
Laying down will now only take 3 ticks to get up, from 5.

You can no longer punch people on the spawn screen.

This is a big one and was cleared by two heads, TK will only allow you to pick up items.  If you have an item in your hand it will act normal.

This revision got much larger than originally intended my tests show everything is working fine, but you never know.  Ill likely do more mob teaks in the next few days.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2333 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-08 10:38:01 +00:00