Commit Graph

14810 Commits

Author SHA1 Message Date
kevinz000 555702c1d7 flag define precedence 2020-03-26 12:28:05 -07:00
kevinz000 2fd129b74b macros 2020-03-26 12:19:26 -07:00
kevinz000 289d581e66 ok bet 2020-03-26 12:19:09 -07:00
kevinz000 92b809634b k 2020-03-26 11:32:18 -07:00
Ghom 4e531518c3 Update bees.dm 2020-03-26 17:20:57 +01:00
Ghom 38c37d75a3 Update bees.dm 2020-03-26 17:15:45 +01:00
deathride58 0bf2cf0484 Adds a lfwb-inspired orbiting pixel + flashing outline animation to the sprint and combat buttons (toggleable via prefs) (#11623)
* Adds a flashing effect to the sprint and combat mode toggles (toggleable via prefs)

* Adds the ability to change the color of the hud toggle flash as well
2020-03-26 16:51:48 +01:00
Artur e8f3e0a3a1 Forgot to add the mutation, what a dummy i am 2020-03-26 09:49:20 +02:00
kevinz000 825adfa29f whew 2020-03-25 21:23:54 -07:00
kevinz000 13a8e7a777 k 2020-03-25 21:06:01 -07:00
kevinz000 0774bca2f4 wew 2020-03-25 20:51:42 -07:00
necromanceranne b57ce2d7ff missed this with my last pr (#11619) 2020-03-26 01:01:34 +01:00
Ghommie 36d5d5e141 Antagonists such as wizard and nuke ops are now more anonymous. 2020-03-25 23:33:50 +01:00
necromanceranne 26ec48f174 straight shooting guns (#11602) 2020-03-25 21:18:02 +01:00
kevinz000 0f4444b567 Nerfs piggyback and fireman carrying (#11555)
* ok

* daze duration increased, MOBILITY_USE now has.. a use.

* k

* @ghommie
2020-03-25 21:16:35 +01:00
kevinz000 4d43f2bdf9 Merge pull request #11605 from necromanceranne/ONLY_TRUST_YOUR_FISTS
PUNCHING: YOU SHOULD BE SCREAMING EDITION
2020-03-25 12:23:08 -07:00
kevinz000 6464c2470a Merge pull request #11600 from Ghommie/Ghommie-cit641
Removes dead flightsuit code leftovers and bad hook.
2020-03-25 12:20:17 -07:00
kevinz000 f41e5655d8 Merge pull request #11592 from Ghommie/Ghommie-cit639
Fixing an inconsistency with nuclear bombs exploding on station level space.
2020-03-25 12:19:15 -07:00
kevinz000 46e3267d4c Merge pull request #11557 from Ghommie/Ghommie-cit632
Removes species default_features variable.
2020-03-25 12:16:40 -07:00
Artur 4c4b1b340b might as well fix the regen core name and a few tweaks. 2020-03-25 20:24:54 +02:00
Artur 2546de3ee2 This is not neccesary 2020-03-25 19:45:40 +02:00
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
Artur 7d22cb00d0 Mixes and fixes 2020-03-25 19:32:46 +02:00
Ghom e4550efb39 Fixing creamed snout overlay a second time. 2020-03-25 17:45:11 +01: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
Ghommie c05d2c1572 Making it actually work. 2020-03-25 17:08:09 +01: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
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
Artur fdc6a02eea Hm 2020-03-25 12:46:42 +02:00
Ghommie c6b4b5f686 lazy fix before I go to sleep. 2020-03-25 05:17:09 +01:00
Ghom edfc77fc2a Fixes cold movespeed slowdown affecting floating mobs (no gravity). 2020-03-25 04:18:01 +01:00
Kraseo 8d6f2fbab5 this was a bad idea (#11594) 2020-03-25 04:05:14 +01:00
kevinz000 4a84736eff more 2020-03-24 19:57:04 -07:00
kevinz000 1a7e812d55 wip 2020-03-24 19:51:23 -07:00
Ghommie c1e13a83fb Boom. 2020-03-25 03:35:29 +01:00
kevinz000 2e0992dbb9 k 2020-03-24 19:29:54 -07:00
Ghommie f3b6b2f8e4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit642 2020-03-25 02:49:02 +01:00
Ghommie c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +01:00
necromanceranne 2b66eadc5e OW MY LIMBS HURT MORE FROM STAMINA DAMAGE 2020-03-25 09:54:46 +11:00
necromanceranne c0029612a3 SO YOU DON'T HAVE HORRIBLE MATH PROBLEMS 2020-03-25 08:53:30 +11:00
necromanceranne 3c548a3819 YES OFFICER I DO HAVE A DEADLY WEAPON THESE HANDS 2020-03-25 08:33:23 +11:00
Kraseo 0efa6fd065 gimme chokies uwu (#11601) 2020-03-24 20:58:41 +01: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
zeroisthebiggay 82396c33cf i made an oops (#11591) 2020-03-24 20:34:01 +01:00
Ghommie 54cdae148d Removes uncompiled flightsuit code leftovers and bad hooks. 2020-03-24 20:28:13 +01: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
Artur 9bb7529a49 Progress 2020-03-24 16:55:46 +02: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
Artur c6a8515297 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-24 12:36:21 +02:00