Commit Graph

1286 Commits

Author SHA1 Message Date
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
Trilbyspaceclone
7ed168da7f Update hivelord.dm 2020-04-05 03:05:41 -04:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616
Spellcasting element
2020-04-03 16:31:10 -07:00
Putnam3145
736ef2cb7c Merge pull request #11705 from Ghommie/Ghommie-cit659
It's past midnight, time for your runtime errors fixing.
2020-04-01 23:16:29 -07:00
Ghom
5f128447f5 Update guardian.dm 2020-04-01 02:21:50 +02:00
Ghommie
8bb98f92ca It's past midnight, time for your runtimes flattening. 2020-04-01 00:47:29 +02:00
Ghommie
021ebcec66 Massive megafauna buff. 2020-03-31 14:09:32 +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
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
6e6d8b5098 didnt port this properly 2020-03-27 22:07:48 -04:00
ZeroMan
54bce5ecc6 i am hol horse 2020-03-27 18:23:18 -04: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
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
kevinz000
bf0970d8c3 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-23 15:34:04 -07: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
kappa-sama
1d2264849e meh (#11584) 2020-03-23 15:50:53 +01:00
kevinz000
a6ca854e5c Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-22 15:07:41 -07:00
Xantholne
71fc6bc693 Fixes bumbles resting (#11564)
* Fixes bumbles resting

* Update code/modules/mob/living/simple_animal/friendly/bumbles.dm

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

* Update bumbles.dm

* Update bumbles.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-22 13:12:14 +01:00
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549)
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
2020-03-22 13:02:23 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie
2045fb86f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-21 21:41:34 +01:00
kevinz000
300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
* 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

* i hate you

* wrong button

* k

* ok

* bet

* 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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 16:04:26 +01:00
Trilbyspaceclone
2bfc9b8ef8 Gutlunchs now like to eat bodys a bit more! (#11545)
* Update gutlunch.dm

* hey what if we didnt just port a semi fix...
2020-03-21 15:07:32 +01:00
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
kevinz000
a928681401 Merge pull request #11503 from necromanceranne/45_nerf_kitchengun_buff
Removes stun bullet .45/Kitchen Gun a lot more desirable for heavy duty cleaning!
2020-03-17 09:25:51 -07:00
kevinz000
c14b1c2857 linter 2020-03-16 14:18:47 -07:00
kevinz000
9bd275e430 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-16 13:47:53 -07:00
kevinz000
b062c76ca7 Merge pull request #11485 from Ghommie/Ghommie-cit625
Fixing a little issue with the musician trait etcetera.
2020-03-16 13:23:25 -07:00
kevinz000
7fdbcc55c6 s 2020-03-16 11:12:10 -07:00
necromanceranne
6f0fc2bdea I LOVE YOU KITCHEN GUN! 2020-03-17 03:20:53 +11:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000
69374c64c9 k 2020-03-16 04:18:22 -07:00
kevinz000
857f793600 ok 2020-03-16 04:12:54 -07:00
kevinz000
94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
Ghommie
8af3d0e2fa Fixing a little issue with the musician trait etcetera. 2020-03-16 00:09:03 +01:00
Ghommie
ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +01:00
Ghommie
5bfbcd0948 Fixing some GetElement runtimes. 2020-03-15 15:12:35 +01:00
kevinz000
2113b63428 o boy 2020-03-14 21:42:23 -07:00
Kraseo
bee11a2ee5 no i am not testing if mice can chew wires if they're in a stomach now shut the fuck up (#11460) 2020-03-15 04:04:35 +01:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000
3ae8016ec8 Merge pull request #11373 from kappa-sama/supershotty
miner powercreep starring 150 damage pointblank shotgun
2020-03-11 17:27:22 -07:00
kevinz000
54713dc1e4 Merge pull request #11408 from necromanceranne/sleeping_carp_port
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
2020-03-11 17:26:33 -07:00
Ghommie
d31075eb54 Spellcasting element 2020-03-11 16:23:30 +01:00
kevinz000
2bf892c482 Update bubblegum.dm 2020-03-11 08:07:37 -07:00
kevinz000
bfeb2f0952 Update hivelord.dm 2020-03-11 08:07:20 -07:00
kevinz000
2552a34c21 Update hivelord.dm 2020-03-11 08:02:33 -07:00