Commit Graph

60 Commits

Author SHA1 Message Date
nmajask
fc5b71cf84 Pacifists that order stechkins from an uplink get a version loaded with soporific rounds (#13404)
* Pacifist stechkin

Gives pacifists who order stechkins from uplinks get a version loaded with soporific rounds.

* Alerts the user

Alerts the user of the change of ammunition

* Merge branch 'sleepy-round-stuff' of https://github.com/nmajask/Yogstation-But-Worse into sleepy-round-stuff

* Reworks the implementation

Makes starting mag a variable and changes the check to look for pacifism being a quirk.

* Update code/modules/uplink/uplink_items.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-03-13 17:45:52 -05:00
Redmoogle
1074be5011 Cleans up some do_after calls (#12417)
* Replaces do_after delays with defines instead of deciseconds

* Fixes Text
2021-10-09 01:18:35 -04:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
Hopekz
6d43755122 Fixes gun feedback playing when the gun isn't firing. (#9807) 2020-09-27 12:48:16 +01:00
Hopekz
4a4e0bfdb1 Ballistic weapon feedback system (fixed and reuploaded edition) (#9751)
* Reagant viscosity framework

* Revert "Reagant viscosity framework"

This reverts commit d4f9841bd3.

* Fixes camera's + mode feature

* Revert "Fixes camera's + mode feature"

This reverts commit f884130943.

* Amber task force back tanks are non droppable

* Revert "Amber task force back tanks are non droppable"

This reverts commit 6956444f56.

* Ballistic weapon feedback system (Sketchin fully animated as proof of concept)

* Debug messages be gone

* Removes unused sprite

Now only using slide open and close for animations instead of a fire animation

* Adds gun recoil and slide close feedback

* space before jamie gets here

* Forgot to implement feedback_fire_slide

* Merge conflict be gone!
2020-09-24 20:03:36 +01:00
Theos
1463576bf0 REEEEEEEEEEEEEEEEELOADINGGGGGGGGGGGGGGGG (#9201)
* REEEEEEEEEEEEEEEEELOADINGGGGGGGGGGGGGGGG

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* Update ballistic.dm

* can_reload_say fix

* Update ballistic.dm

* Update ballistic.dm

* move countempties to ballistic so I can check for empty shells in magazines

* moved countempties in get_ammo to base ballistic

* want to fucking die

* Update ballistic.dm
2020-07-25 15:53:14 +01:00
alexkar598
8b963c9626 Documents 61 files (#9306)
* Document the world (#46495)

* Document drone verbs.dm

* Document the outfit datum with autodoc (#45415)

* Uncurse take_damage and document obj_defense.dm (#45146)

The original take_damage proc defined vars for no good reason had some 
duplicate code and wasn't very readable.

If you are wondering why it calls obj_break every time it takes damage 
while below integrity_failure, that's the way it used to be. Most (if 
not all) stuff that takes advantage of this functionality already 
accounts for this.

* Convert some code docs into the auto doc format (#45101)

* Commit Message

* Fixes

* e

* Documents browserOutput.dm (#51439)

* Add autodoc to the callback datum (#45463)

* Autodoc the vending machine (#45468)

* Autodoc the vending machine

* Update code/modules/vending/_vending.dm

Co-Authored-By: Tad Hardesty <tad@platymuus.com>

* autodoc organ helpers (#45464)

* timer proc autodocs (#46530)

* bunch of define autodocs

* ballistic guns autodoc (#45578)

* ballistic guns autodoc

* fixes

* client vars autodoc (#46446)

About The Pull Request

Autodocs client vars

* Autodoc for XB and Research

* shuttle docking autodoc (#48677)

* Add autodocs for reagents (#49478)

* Fix

Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: Jonathan (JJRcop) Rubenstein <jrubcop@gmail.com>
Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
Co-authored-by: alexkar598 <>
Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: actioninja <actioninja@gmail.com>
2020-07-24 21:38:47 -04:00
Nich
0b875456e3 Revert "* extra spaces removed from "span class = '" --> "span class='""
This reverts commit 4ade98df11.
2019-07-16 03:34:48 +02:00
kingofkosmos
4ade98df11 * extra spaces removed from "span class = '" --> "span class='"
* warning-spans added to cases of "You need..."
2019-07-16 03:30:29 +02:00
vuonojenmustaturska
0c73eff422 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-07-16 03:20:17 +02:00
yogstation13-bot
1bb5d34765 Tweaks sawn off guns. Chainsaw edition. 2019-07-05 04:43:28 +01:00
ShizCalev
f5239d95e1 Merge pull request #44280 from kingofkosmos/spanendingfixes
Adds missing </span>'s.
2019-06-08 20:14:18 +02:00
yogstation13-bot
32070e46c2 [MIRROR] [s] Fixes an exploit involving tactical reloading (#5274)
* [s] Fixes an exploit involving tactical reloading (#43664)
2019-04-27 18:17:15 -05:00
yogstation13-bot
c88c9ba11b [MIRROR] Enables tac reloads for most ballistic weapons. (#5044)
* Enable tac reloads for most ballistic weapons (#43466)
2019-04-05 15:59:37 -05:00
ShizCalev
6040b8e2c0 Fix runtime when firing a gun with the magazine removed (#43176) 2019-03-20 07:17:51 +01:00
Rob Bailey
43ede30347 [READY] Open bolt weapons eating bullets fix (#42948)
About The Pull Request

Fixes #42926
Why It's Good For The Game

Fixes broken shit

No CL, this was pretty hard to notice unless you were intentionally pulling the mag out and putting it in for some reason.
2019-03-17 14:24:05 +01:00
yogstation13-bot
34d1e7f253 [MIRROR] Fixes the bullet count when unloading weapons such as the double barrel and revolver (#4646)
* Fixes the bullet count when unloading weapons such as the double barrel and revolver

* Merge pull request #42947 from actioninja/magcountfix

Fixes the bullet count when unloading weapons such as the double barrel and revolver
2019-03-02 09:49:47 -05:00
yogstation13-bot
a1d25c3328 [MIRROR] Fixes the RPG, renames it and adds some fluff text (#4563)
Replaces refs to /obj/item/ammo_box/magazine/rocket with /obj/item/ammo_casing/caseless/rocket
2019-02-25 16:37:44 -06:00
yogstation13-bot
2c16df778f [MIRROR] Makes unloading ballistic weapons better (Namely revolvers) (#4560)
* Makes unloading ballistic weapons better (Namely revolvers)

* Merge pull request #42837 from MadmanMartian/better_unload

Makes unloading ballistic weapons better (Namely revolvers)
2019-02-25 05:42:03 -05:00
Rob Bailey
1e50117949 More General Gun Fixes (#42693)
Fixes some incorrect sprite paths, bad implementation, and logic inconsistencies that were resulting in missing sprites and fucked up sprites. Fixed some weirdness with the RPG due to wrong bolt type. Fixed bullet count being incorrect on anything with an internal magazine. Fixed issue with internal magazine tacloads that was resulting in them locking up and being unable to shoot.

Closes #42683
Closes #42672
2019-02-19 15:54:04 +01:00
Rob Bailey
718e38701a Yet more gun fixes (#42722)
Continues fixing the tide of broken shit with my awful PR.

This time around:
Corrects a control message for the l6 saw on examine
Reworks the way that open bolt guns work so that they actually work the way open bolt guns are supposed to. Loud bolt drop when you try to fire an empty magazine included.
Fixes bulldog magazine overlays.
Fixes an issue with tacloads not updating the removed magazine's icon state correctly.
Fixes locking bolt not locking back on the last bullet fired but instead on the
2019-02-11 10:27:59 +01:00
nichlas0010
484be9aeb3 Merge branch 'master' into upstream-merge-42666 2019-02-05 22:17:45 +01:00
Rob Bailey
c0a4aaf6be Gun (Hot)Fixes (#42666)
Fixes my broken bullshit.
2019-02-04 21:34:23 +01:00
Rob Bailey
6e4089224a [READY] I got guns (#41804)
cl actioninja\memager
refactor: Ballistic guns have been almost entirely reworked from a backend side. This primarily focused on moving as much as possible into the base ballistic gun and turning as many other guns into essentially varedits as possible.
add: Guns can now be racked. This is the default action unless the magazine is empty.
add: Guns now can have the magazine removed by clicking on them with an open hand while they are in hand.
tweak: Suppressors are now removed by alt clicking instead of clicking with an open hand
add: Guns now have various bolt types that all function a bit differently. Open bolts cannot have a bullet chambered with no mag, locking bolts lock back after running out of ammo, etc.
add: All ballistic gun sounds are controlled by variables instead of hardcoded usages.
tweak: The l6 LMG has a reworked control scheme. alt + click to open and close the cover, open hand to remove mag, place mag in by slapping them together, default action is rack.
tweak: Functionality that used to be snowflake code such as tactical reloads has been moved to the base gun, and can be toggled by variables.
refactor: All shotguns are now properly subpaths of the shotgun type. They still work the same.
imagedel: Gun sprites have been almost entirely overhauled to use overlays instead of states. This collapsed the L6 sprite from 20 sprites to 9 sprites to give an example.
soundadd: Remixed versions of the shotgun and base gun firesound
soundadd: New rifle firesound for l6 and moist nugget, new SMG fire sound, new sniper fire sound.
soundadd: Lots of new weapon operation sounds such as racking and bolts and the like.
imageadd: New sprites for the Riot Shotgun, Combat Shotgun, c20r, Deagle, m90, double barrel shotgun and 1911 by Memager.
imageadd: All gun sprites that were pointing to the left have been flipped to point to the right.
balance: Shotguns now can be pumped faster.
balance: Bulldog can now be tac reloaded
balance: Sawn off shotguns now have an accuracy penalty and recoil
/cl
2019-02-04 21:33:10 +01:00
pubby
bca3c55884 Drop "universal" from the suppressor name. (#42574)
It's incompatible with lots of guns so the name is misleading.
2019-01-30 08:32:29 +01:00
Rob
76790b32fc [EXTRAREADY][AAAAAA] Hey revolver, don't mothers make good fathers? (#41620)
tweak: Suppressed and dry fire sounds are now stored as a variable, and can be edited on a per gun basis.
sounddel: The standard gun dry fire sound was collapsed to one sound instead of 4. They were all just pitch variations anyways, which is now covered by built in sound pitch variation.
soundadd: Revolvers now have a unique gunshot sound that is slightly different for 357 and 38.
soundadd: Revolvers now have a unique dry fire sound.
soundadd: Revolvers now make a unique noise when emptying them besides just the sound of shells falling out.
soundadd: Spinning a revolver such as the Russian Revolver now makes a sound.
spellcheck: Syndicate sniper kit now includes a suppressor instead of a "supressor."
2018-12-02 08:29:15 +01:00
81Denton
d811f2684c Improves Uplink descriptions + formatting (#41565)
* Improves Uplink descriptions + formatting

* ree

* linebreaks

* misc fixes
2018-11-18 16:25:12 +01:00
ShizCalev
de3cdd8c78 Fixes gibs not being passed mob DNA (#41374)
* Fixes gibs not being passed mob DNA

* Cleanup, fixed map-placed gib spawners having no DNA
2018-11-10 20:22:53 +01:00
Ling
120f820822 Revert "Revert "[MIRROR] Fixes grenade launchers reporting incorrect live rounds"" 2018-10-01 10:46:26 +02:00
ShizCalev
05a0a52cc7 Adds RPGs to Nuke Ops (#40372)
* Gives Syndies RPGs

* Makes the rocket reusable

* fixed minor sprite issue

* SRM Rocket renamed to HE rocket
2018-09-27 10:47:41 +01:00
Ling
5d34b4c711 Revert "[MIRROR] Fixes grenade launchers reporting incorrect live rounds" 2018-09-23 16:31:05 +02:00
ShizCalev
fa83e11b6d Fix grenade launchers reporting incorrect live rounds (#40371) 2018-09-23 10:44:38 +01:00
Jordan Brown
aa7b055b35 Fix and optimize Dockerfile (#39019)
* Change sound double quotes to single quotes

* Remove broken guitar note bs

* Fix and optimize Dockerfile
2018-07-10 03:43:28 +01:00
oranges
feca7a7b38 Uppercases slot defines. 2018-04-28 09:49:08 +01:00
AsV9
d338cac150 Merge remote-tracking branch 'tgstation/master'
Not sure if this worked. Used a wonky special snowflake strat to merge.
2018-03-24 08:57:13 +01:00
vuonojenmustaturska
440e888c1f Clean up all sorts of crap, mostly defines (#36105)
* cleanbot

* rejuv

* more crap

* more crap

* still compiles

* clean

* is_crap
2018-03-05 02:07:27 +11:00
ShizCalev
665d6bd39d Corrects invalid process_fire args 2018-01-22 04:47:58 -05:00
Jack Edge
eed34adc0d Late joiners also get summoned guns/magic
🆑 coiax
add: If you have the (mis)fortune of late joining a shift where a crazy
wizard has given magical items or firearms to the crew, you will find
yourself also carrying such equipment.
/🆑

- Scrying orb now just grants the XRAY mutation to the first human that
picks it up
- The chance of a "special" magical item is now 1/50, up/down from 0-1
times per summon magic.
- The suppressor option in summon guns has been changed from a stetchkin
plus a silencer, to just a stetchkin with a silencer pre-installed.
- The summon magic/gun tables are now global typelists, rather than a
godforsaken giant switch statement
- Badmins can call the global /proc/give_guns(human) or
/proc/give_magic(human) for all their badmin needs.
- The chance of new players being survivor antags is the last effect
that triggered summon guns/magic (25 for wizard, 10 for summon event).
2017-12-29 22:20:26 +00:00
kevinz000
05be346f8a Component Forensics, Blood Decals, and Cleaning 2017-12-24 18:19:43 -08:00
ShizCalev
b539341768 Fixes bullets making sounds in space and water (#33672)
* Bullet sounds

* explicit lists
2017-12-21 01:08:39 -05:00
oranges
fe42f52109 Halve gun empty sound level 2017-12-18 22:52:31 +00:00
ShizCalev
c95fc8c78d Gun sounds (#33615) 2017-12-18 10:51:22 -05:00
vuonojenmustaturska
5233ec1f6a Finishes the forceMove port (#33519)
* a thing

* thingy 2: electric boogaloo

* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
ShizCalev
0715bb9dea Adds new gun dry firing sounds (#33503)
* Adds new gun dry firing sounds

* Don't want to hear click when you want to hear bang
2017-12-14 07:14:36 -05:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
Jordan Brown
04c05d8e5c Adds defines for organ slots (#31737) 2017-10-15 20:33:35 -04:00
Tad Hardesty
13f32a938b Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 21:06:46 +13:00
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
ShizCalev
5d91844926 Fixes suppressing weapons in your bag / pocket (#30894)
* Fixes suppressing in pocked and w_class issues

* Used defines for some things

* Reworded

* Removed the now redundant initial_w_class var

* Early returns

* Null
2017-09-26 11:19:00 +02:00
JJRcop
69669be0ad Possibly fixes runtimes with gun suicide
oops
2017-09-22 02:54:34 -04:00