Commit Graph

5913 Commits

Author SHA1 Message Date
Unknown 013e591218 Bumbles wake up sleepy head 2020-03-27 20:22:22 -06:00
ZeroMan 9f6c97c63f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into donotreviveme 2020-03-27 22:10:42 -04:00
ZeroMan 6e6d8b5098 didnt port this properly 2020-03-27 22:07:48 -04:00
ZeroMan dba359cbaa commit not alive immediately 2020-03-27 20:51:04 -04:00
Putnam3145 b5c4124d7a Merge pull request #11638 from Ghommie/Ghommie-cit646
Moderately unoriginal PR title about runtime errors.
2020-03-27 17:12:49 -07:00
ZeroMan 54bce5ecc6 i am hol horse 2020-03-27 18:23:18 -04:00
Ghommie 41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
ZeroMan 7b34ebc9b5 commit not alive immediately 2020-03-27 17:13:45 -04:00
Putnam3145 47c0cc8057 Merge pull request #11633 from Citadel-Station-13/Ghommie-patch-5
Blacklists unsynthetizable reagents from botany bees.
2020-03-26 18:53:44 -07:00
Lin d907a4948b Merge pull request #11615 from Citadel-Station-13/Ghommie-patch-3
Fixing creamed snout overlay a second time.
2020-03-26 17:57:50 -05:00
Ghommie 3c42e9eefd Moderately unoriginal PR title about runtime errors. 2020-03-26 23:22:51 +01:00
kevinz000 ba713508ce counterattacking? 2020-03-26 14:19:54 -07:00
kevinz000 8fe064da74 save memory.. 2020-03-26 14:13:18 -07:00
kevinz000 b32e6c3b5b Merge pull request #11607 from Ghommie/Ghommie-cit642
Adds privates visibility preferences. Also underwear now fulfills its purpose.
2020-03-26 13:24:26 -07:00
kevinz000 3eca22350a Merge pull request #11608 from Citadel-Station-13/Ghommie-patch-1
Fixes cold movespeed slowdown affecting floating mobs (no gravity).
2020-03-26 13:24:06 -07:00
kevinz000 135ca27281 parry 2020-03-26 13:08:05 -07:00
kevinz000 4391fc3714 pixel shifting 2020-03-26 12:51:17 -07:00
kevinz000 940cdd13b0 compile 2020-03-26 12:29:43 -07:00
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
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
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 46e3267d4c Merge pull request #11557 from Ghommie/Ghommie-cit632
Removes species default_features variable.
2020-03-25 12:16:40 -07: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
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
kevinz000 4a84736eff more 2020-03-24 19:57:04 -07:00
kevinz000 1a7e812d55 wip 2020-03-24 19:51:23 -07: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 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
Ghommie 54cdae148d Removes uncompiled flightsuit code leftovers and bad hooks. 2020-03-24 20:28:13 +01:00
Artur 9bb7529a49 Progress 2020-03-24 16:55:46 +02:00
Artur c6a8515297 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-24 12:36:21 +02:00