Commit Graph

1208 Commits

Author SHA1 Message Date
necromanceranne
0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
Putnam3145
1a6107a518 Removed nymphomania, plus code cleanup (#11641) 2020-03-27 14:03:05 +01:00
kevinz000
8d87ed7b64 Merge pull request #11589 from Ghommie/Ghommie-cit638
Made votes obfuscation settings more robust, including them in custom votes.
2020-03-25 12:18:50 -07: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
fd9985fb27 Made votes obfuscation settings more robust. 2020-03-23 18:12:12 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01: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
kevinz000
84a44e226c micro optimization for atmos add_to_active/react_queue (#11508)
* k

* Update code/controllers/subsystem/air.dm

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

* Update code/controllers/subsystem/air.dm

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

* Update code/controllers/subsystem/air.dm

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 15:58:18 +01:00
Ghom
d8a6e9b94f Merge branch 'master' into Ghommie-cit621 2020-03-15 13:07:45 +01:00
Seris02
bfd001d165 quirk fixes (#11466) 2020-03-15 04:04:50 +01:00
Putnam3145
52e20cdadf Made server votes not subject to the cooldown (#11464) 2020-03-15 04:04:05 +01:00
kevinz000
395fa32136 Merge pull request #11447 from Ghommie/Ghommie-cit618
Porting datum components system updates.
2020-03-14 09:09:50 -07:00
Ghommie
1d51ac5ff2 Fixing some bug reports. 2020-03-14 02:34:25 +01:00
Ghommie
d1b39b6590 . 2020-03-12 21:22:39 +01:00
Ghommie
0602e728c0 Doesn't delete the old auto transfer behavior. 2020-03-12 21:15:12 +01:00
Ghommie
663a849afe Makes the autotransfer subsystem a bit more optional. 2020-03-12 21:02:34 +01:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
Ghom
9e3a3dddfd Merge pull request #11429 from Putnam3145/dynamic-tweaks
Dynamic tweaks/fixes
2020-03-12 14:20:28 +01:00
Ghom
9e970b4a3e Merge pull request #11430 from Putnam3145/fix-transfer
Tweaks for the transfer vote
2020-03-12 14:20:10 +01:00
Ghom
c771471895 Merge pull request #11406 from kevinz000/minimaps
Ports station minimaps from Yogstation thank you monster860 you are an epic gamer
2020-03-12 14:18:39 +01:00
kevinz000
14b22f0b67 Merge remote-tracking branch 'citadel/master' into minimaps 2020-03-11 17:32:15 -07:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Putnam
8a00a15621 removed no-votes mattering more than votes (??) 2020-03-11 03:01:05 -07:00
Putnam
a1f820be45 maybe check the rest of the codebase 2020-03-11 03:00:07 -07:00
Putnam
430f3decdc Fixed dynamic runtiming in some circumstances. 2020-03-11 02:48:18 -07:00
Ghom
103dbe18b3 Update vote.dm 2020-03-10 22:24:27 +01:00
kevinz000
9a9bd2f575 woops 2020-03-10 01:12:58 -07:00
kevinz000
8a1b57f10b k 2020-03-09 21:01:03 -07:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
keronshb
0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
To fixs something?
2020-03-08 17:51:17 -04:00
Ghom
57db0e0320 Merge pull request #11383 from Putnam3145/fix-storyteller-weights
Gives storyteller weights defaults properly (whoops)
2020-03-08 07:18:09 +01:00
Putnam
dfa7637f1b fixes storyteller weights 2020-03-07 22:09:20 -08:00
keronshb
228012c718 Blob refactor (#43872)
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
kevinz000
5ebf8ef1e3 Merge pull request #11316 from Citadel-Station-13/Ghommie-patch-3
Makes cargo passive point generation 125 a minute and not 2 or so every tick.
2020-03-06 00:19:26 -07:00
kevinz000
16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
kevinz000
9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Ghom
d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
2020-03-04 23:46:10 +01:00
Ghommie
60c7268e37 Also fixing bloodsucker coffins. 2020-03-04 16:29:09 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
kevinz000
8923b7e72d minimaps 2020-03-04 01:21:16 -07:00
Ghom
d318525078 Update shuttle.dm 2020-03-03 15:43:10 +01:00
Ghom
b7dda0080d Fixes cargo passive point gen (ergo making it 125 a minute and not 1000+) 2020-03-03 15:40:53 +01:00
kevinz000
81f84f1bd1 Update garbage.dm 2020-03-02 18:18:44 -07:00
Ghom
fca911b74f Merge pull request #11281 from Ragolution/master
Just another round-end sound.
2020-03-02 16:17:37 +01:00
Ragolution
49bff8e649 Update ticker.dm
Minor typo
2020-02-29 01:15:16 -05:00
Ragolution
763fee141d Adds new audio file to defines in ticker for round-end sounds.
hello ticker my old friend
ive come to fuck with you again
the memes to my mind, slowly creeping
shitposts when i should probably be sleeping

and the question
that was planted in my brain
still remains

why the fuck is this in the /ticker/
2020-02-29 01:11:20 -05:00
kevinz000
4b9dfdf476 types 2020-02-28 13:24:39 -07:00
Artur
f8469c89a4 Conflict fix 2020-02-25 10:46:20 +02:00
BlackMajor
fc85f62546 Merge branch 'master' into SpaceRuins 2020-02-25 16:51:39 +13:00