Commit Graph

32223 Commits

Author SHA1 Message Date
kevinz000 cbb5d52ca1 Melee Stagger (#11443)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* wack

* animation is now shorter

* linter save me

* i hate you

* k

* k

* k

* i hate you

* wrong button

* k

* ok

* bet

* bet

* bet

* Update item_attack.dm

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

* fix

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 18:37:39 +01:00
CitadelStationBot 66c3f6e1be Automatic changelog generation for PR #11515 [ci skip] 2020-03-25 11:40:41 -05:00
Putnam3145 3d8084709b A dynamic rework: target threat levels (#11515)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 17:40:37 +01:00
CitadelStationBot 6f9e9d0be7 Automatic changelog generation for PR #11610 [ci skip] 2020-03-25 08:29:35 -05:00
necromanceranne 84f37092fe Prevents being able to fire a russian revolver in your off-hand while dual-wielding. (#11610) 2020-03-25 14:29:32 +01:00
CitadelStationBot 79b408c389 Automatic changelog generation for PR #11595 [ci skip] 2020-03-25 08:17:46 -05:00
Detective-Google 912ec5806d Bringing Our shotguns up to (TG)snuff (#11595)
* Makes Citadel shotguns match TG shotgun fire delay

* Makes Riot + Combat shotguns require two hands to fire

* also makes the 2handed change apply to double barrels and improvs.
2020-03-25 14:17:43 +01:00
monster860 927852a93a Make the no-ass-slap message actually display (#11612) 2020-03-25 12:56:57 +01:00
CitadelStationBot b8ef114bcc Automatic changelog generation for PR #11594 [ci skip] 2020-03-24 22:05:16 -05:00
Kraseo 8d6f2fbab5 this was a bad idea (#11594) 2020-03-25 04:05:14 +01:00
CitadelStationBot 8434670d21 Automatic changelog generation for PR #11601 [ci skip] 2020-03-24 14:58:44 -05:00
Kraseo 0efa6fd065 gimme chokies uwu (#11601) 2020-03-24 20:58:41 +01:00
CitadelStationBot 60a88beb70 Automatic changelog generation for PR #11590 [ci skip] 2020-03-24 14:39:49 -05:00
Timothy Teakettle 62d1a1f734 cook now gets to choose their ingredient box + sushi ingredient box (#11590)
* Update miscellaneous.dm

* Update cook.dm

* fixes some bugs

* i broke something again and now fix it

* fixes remote, edits ingredient box contents

* even more wildcard items

who doesn't love eggs, grapes and various kinds of human meat? (skeleton meat is a thing for some reason, and thus it goes. IN THE LIST.)

* removes a random newline

* adds a newline to the end of the file i accidentally removed

* why was there a newline here too
2020-03-24 20:39:46 +01:00
CitadelStationBot 3fd418295e Automatic changelog generation for PR #11591 [ci skip] 2020-03-24 14:34:04 -05:00
zeroisthebiggay 82396c33cf i made an oops (#11591) 2020-03-24 20:34:01 +01:00
CitadelStationBot 5089190c83 Automatic changelog generation for PR #11580 [ci skip] 2020-03-24 14:03:52 -05:00
Timothy Teakettle b789cd246a frying changes with bad chems (#11580)
* Update toxin_reagents.dm

* Update snacks_bread.dm

* Update toxin_reagents.dm
2020-03-24 20:03:49 +01:00
CitadelStationBot ebb10d766e Automatic changelog generation for PR #11546 [ci skip] 2020-03-24 08:03:34 -05:00
Trilbyspaceclone f8147e5a85 Ports over Mortars and Pestles (#11546)
* 2 ports for the commit of 1!

ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086

* what if we didnt have that...

* Apply suggestions from code review

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-24 14:03:31 +01:00
CitadelStationBot 613c66d88e Automatic changelog generation for PR #11524 [ci skip] 2020-03-23 12:40:34 -05:00
kevinz000 ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
CitadelStationBot afe762ba4d Automatic changelog generation for PR #11536 [ci skip] 2020-03-23 12:40:22 -05:00
kevinz000 cc80d463b7 Merge pull request #11536 from Trilbyspaceclone/patch-316
Water and Unholy water tweaks
2020-03-23 10:40:19 -07:00
CitadelStationBot a63aaa2c9b Automatic changelog generation for PR #11570 [ci skip] 2020-03-23 12:38:25 -05:00
kevinz000 33317e20fe Merge pull request #11570 from zeroisthebiggay/contractorrandomitemspowergaming
moves sneaksuit to bundles, removes useless contractor items, adds sneaksuit to contractor pool of random items
2020-03-23 10:38:22 -07:00
kevinz000 3990b1f4c9 Merge pull request #11571 from Ghommie/Ghommie-cit635
Size preferences made configurable.
2020-03-23 10:37:54 -07:00
CitadelStationBot 77b92f3f78 Automatic changelog generation for PR #11572 [ci skip] 2020-03-23 12:37:45 -05:00
kevinz000 ddd00b1981 Merge pull request #11572 from DeltaFire15/clockies-vanguardstam
Clockie Vanguard Spell - rebalance for stamcombat
2020-03-23 10:37:42 -07:00
CitadelStationBot 3f653c7d57 Automatic changelog generation for PR #11576 [ci skip] 2020-03-23 12:36:47 -05:00
kevinz000 fbe77495e8 Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020
Porting Juices, Drinks, and Salami [READY]
2020-03-23 10:36:44 -07:00
CitadelStationBot e6e73e0888 Automatic changelog generation for PR #11578 [ci skip] 2020-03-23 12:36:20 -05:00
kevinz000 dfec544d71 Merge pull request #11578 from Ghommie/Ghommie-cit636
Fixing owner not being set in mutation/on_aquiring.
2020-03-23 10:36:17 -07:00
CitadelStationBot 96f0d51184 Automatic changelog generation for PR #11581 [ci skip] 2020-03-23 12:34:05 -05:00
kevinz000 57429493c6 Merge pull request #11581 from Ghommie/Ghommie-cit637
M/F body preferences.
2020-03-23 10:34:02 -07:00
CitadelStationBot 8ca7ffd780 Automatic changelog generation for PR #11582 [ci skip] 2020-03-23 12:28:17 -05:00
kevinz000 9be09df036 Merge pull request #11582 from keronshb/ReverseRNGMiningBase
Reverses Random Mining Base Placement
2020-03-23 10:28:14 -07:00
keronshb ecbf84d21d Fixes the duplicate lavaland on shuttle issue
Fixes the duplicate lavaland on shuttle issue
2020-03-23 12:43:51 -04:00
kappa-sama 1d2264849e meh (#11584) 2020-03-23 15:50:53 +01:00
CitadelStationBot 5ccd38a59e Automatic changelog generation for PR #11573 [ci skip] 2020-03-23 09:47:44 -05:00
zeroisthebiggay f5a96241ab sneaksuits are not fireproof (#11573)
* and i wanna die

* i decide to revert

* a a a a
2020-03-23 15:47:41 +01:00
Putnam3145 a5224b0b8b Merge pull request #11568 from Ghommie/Ghommie-cit634
Two runtimes, one fix.
2020-03-23 00:03:23 -07:00
Winter Flare 29576ee6a7 Travis Please 2020-03-22 20:34:38 -04:00
Winter Flare 0effeb6ed5 Ports Hyper Drinks
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
2020-03-22 19:33:50 -04:00
Ghommie c798b31d6f bodyparts cache aaaaa. 2020-03-22 22:20:26 +01:00
keronshb 739cd21d7c Checked lavaland
Checked lavaland
2020-03-22 16:17:23 -04:00
keronshb 7776fff850 Lavaland change
Revert
2020-03-22 16:00:24 -04:00
keronshb 830f646383 Revert "Merge pull request #11225 from r4d6/Random-Mining"
This reverts commit ea5774e713.
2020-03-22 15:55:08 -04:00
Winter Flare 9d9720ed21 QoL Vendor Reorganisation
Moves Bowls and Glasses to top of vendors.
2020-03-22 15:30:29 -04:00
Winter Flare cd3f8f5df5 Porting More Stuff
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
2020-03-22 15:13:00 -04:00