Commit Graph

57 Commits

Author SHA1 Message Date
Timothy Teakettle f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Ghommie 2811f744e3 Fixing some mistakes with the priority overlays removal PR. 2020-08-26 14:00:35 +02:00
Ghommie 921a963e59 fix 1 2020-08-20 20:26:29 +02:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Ghom a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Akrilla 87dce0c3e9 dont need to null when qdeling later 2020-04-09 18:41:39 +01:00
Ghommie 3c42e9eefd Moderately unoriginal PR title about runtime errors. 2020-03-26 23:22:51 +01:00
Ghom b378da2468 Update energy.dm 2020-03-03 15:06:42 +01:00
Ghom 5e10f822e6 Update energy.dm 2020-02-17 13:40:37 +01:00
Ghommie aba636a44c ok 2020-02-17 00:13:16 +01:00
kevinz000 45bec21520 fix sync 2020-02-10 04:01:21 -07:00
Ghom 71f44a7085 Merge pull request #10892 from kevinz000/small_guncode_refactor
Small guncode refactor but it works
2020-02-07 23:13:21 +01:00
Ghommie 233ed5873f race conditions and turfs beings special. 2020-02-06 01:13:28 +01:00
kevinz000 8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -07:00
kevinz000 9e08f8bed7 Update energy.dm 2020-01-31 01:23:38 -07:00
kevinz000 3ce1fe2585 changes 2020-01-27 22:26:43 -07:00
kevinz000 9d047f07f8 separate this a bit 2020-01-27 21:08:47 -07:00
kevinz000 57b977c2e5 why 2020-01-27 20:41:45 -07:00
kevinz000 7d53d6e162 s 2020-01-27 20:24:02 -07:00
kevinz000 7ae43a2249 fix 2020-01-27 17:51:59 -07:00
kevinz000 0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 6cc07c5bc3 Ports the energy gun empty state overlay fix. 2019-11-29 02:59:54 +01:00
Ghommie e991328087 progress 2019-10-19 15:02:56 +02:00
nik707 a89ab006c1 Adds new and immersive sound for combat
Dink!
2019-03-05 15:03:08 -06:00
Ghom 704d7403ac Tweaking some cyborg mounted energy guns. (#8037)
* You get yourself a bottle and say, "I don't love anything anymore."

* the sunset.

* I'm nuclear gun, I'm wild.
2019-02-27 16:02:33 -08:00
Poojawa 720b25c6f5 floor fixes and gun memes 2018-09-22 03:50:37 -05:00
deathride58 7650bac441 Upstream bugfix mirror spree (#7541)
* tgstation/tgstation#40061 - Fixes mobs getting stuck at min/max body temperature

* tgstation/tgstation#40043 - fixes beam rifles opening lockers

* tgstation/tgstation#40041 - Pictures of asses are properly sized now

* tgstation/tgstation#40084 - fixes lastattacker not including unarmed attacks

* tgstation/tgstation#39968 - Fixes plastic golems ventcrawling with items in pockets

* tgstation/tgstation#39885 - Fix overcharging energy guns crashing the server
2018-09-07 07:25:42 -07:00
Jordan Brown 463945ec76 Merge pull request #38708 from AutomaticFrenzy/patch/energy-gun
Fix runtimes when energy guns are deleted
2018-06-25 14:12:31 -05:00
CitadelStationBot eb2368be03 [MIRROR] Fix inconsistent energy gun suicide (#7012)
* Fix inconsistent energy gun suicide (#38252)

* Fix inconsistent energy gun suicide
2018-06-05 11:18:27 -07:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Dax Dupont 74932ddce0 Gun overlays 2: Electric boogaloo. (#38003)
* Reduces selfcharge gun processing/icon work

* More efficient gun overlays, adds old_ratio var

* oh my god it was calling the egun's update_icon?

* percent proc

* Attachment overlay overhaul

* Cut overlays in egun update

* ebow 1000% better overlay management

* Update gun.dm

* Pointless check

* Giving KA and children consistent icon behavior

* Update kinetic_accelerator.dm

* Fixed

* ..() readded

* ..() readded

* ..() readded

* Antur didnt catch this one heck

* Because confusing vars are apparently more maintainable

* Gun overlays 2: Electric boogaloo

* another one

* Chameleon guns are removed

* tentacles everywhere
2018-05-27 11:41:14 -05:00
ShizCalev b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
MMMiracles 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
oranges 1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
Jordan Brown b305f1bb26 Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears
Halve gun empty sound level
2017-12-20 00:14:28 -06:00
LetterJay 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
ShizCalev 1c142356ff Gun sounds (#33615) 2017-12-18 15:15:25 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
ShizCalev 712b86089d 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 06:15:11 -06:00
ACCount 8a64287249 Integrated circuit fixes and code improvements 2017-11-21 03:04:17 -06:00
kevinz000 b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
Poojawa b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay 4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
2017-06-14 06:41:01 -05:00
CitadelStationBot bb30963100 Fixes shooting self while suiciding with gun without proper firing pin auth (#1520) 2017-06-13 13:42:15 -07:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot e9d00c2aff [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#1191) 2017-05-27 13:36:44 -07:00