Commit Graph

13730 Commits

Author SHA1 Message Date
Ghommie
5e5bc2a690 force push. 2020-03-29 17:01:05 +02:00
Lin
659873979f Merge pull request #11656 from Xantholne/bumbleswakeup
Bumbles my man, you gotta stop sleeping for more than 8 hours it's bad for your health
2020-03-29 02:06:09 +00:00
kevinz000
9595df3e18 Merge pull request #11653 from zeroisthebiggay/holoparsiteportsarefunny
ports tg holoparasite customizations
2020-03-28 16:02:08 -07:00
kevinz000
6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-28 16:00:48 -07:00
kevinz000
0aebf68df0 Merge pull request #11651 from zeroisthebiggay/donotreviveme
ghosts can now DNR
2020-03-28 16:00:08 -07:00
kevinz000
9797089f0c Merge pull request #11650 from Ghommie/Ghommie-cit649
Ports "Adds spam prevention to clients"
2020-03-28 15:59:40 -07:00
kevinz000
015371800c Merge pull request #11649 from Ghommie/Ghommie-cit648
infiltrator sneaky boots fix.
2020-03-28 15:59:10 -07:00
kevinz000
dd90d21f93 Merge pull request #11645 from Trilbyspaceclone/vaild
Et tu?
2020-03-28 15:58:56 -07:00
Putnam3145
8a620b0ebc More dynamic rework: help I wasn't done (#11642)
* 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

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-28 14:46:37 +01:00
Ghom
a85d590b1d Update bumbles.dm 2020-03-28 03:35:12 +01:00
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
Ghommie
9ab0cccdec porting stuff 2020-03-27 19:52:33 +01:00
Ghommie
f7ce5e5de3 infiltrator sneaky shoes fix. 2020-03-27 14:42:23 +01:00
Putnam3145
1a6107a518 Removed nymphomania, plus code cleanup (#11641) 2020-03-27 14:03:05 +01:00
TrilbySpaceClone
879b626cd1 Et tu 2020-03-27 03:12:04 -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
Ghom
a157a933c7 | 2020-03-27 00:18:43 +01:00
Lin
76e4d0e0db Merge pull request #11622 from Ghommie/Ghommie-cit643
Antags such as wizard and nuke ops are now flavorless. Also closet megafauna fix.
2020-03-26 18:06:50 -05: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
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
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
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
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
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
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