shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,026 Commits 5 Branches 0 Tags
d5a43be181932795f71f0bf5285d29bc4e7bfe84
Commit Graph

1228 Commits

Author SHA1 Message Date
Ghommie
d5a43be181 Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart. 2020-04-19 03:07:45 +02:00
UristMcAstronaut
1eafcbeb1e Add files via upload 2020-04-14 16:22:16 +00:00
kevinz000
2961bf8698 Merge pull request #11838 from kappa-sama/gamingtime 
makes circuit theft admin only
 2020-04-14 01:33:06 -07:00
kevinz000
6d7cc834f6 Merge pull request #11379 from Ghommie/Ghommie-cit611 
Polychromic element.
 2020-04-13 17:10:45 -07:00
Ghom
25f1a83473 Merge pull request #11834 from deathride58/linuxfail2topic 
adds rudimentary linux iptables support for fail2topic (and makes fail2topic disabled by default while i'm at it)
 2020-04-13 16:44:15 +02:00
Ghommie
db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
kappa-sama
efe36a02e0 bye 2020-04-12 22:19:10 -04:00
kevinz000
6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672 
Minor action datum refactor and spellcasting fix.
 2020-04-12 17:02:36 -07:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghom
d0af60a2d3 Merge pull request #11817 from Putnam3145/dynamic-lings-2 
More dynamic tweaks + dynamic latejoin changelings
 2020-04-13 01:48:12 +02:00
deathride58
53d893a67e adds rudimentary linux iptables support for fail2topic 2020-04-12 16:21:51 -04:00
Ghommie
31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Putnam
093d2fdeb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-lings-2 2020-04-10 20:12:35 -07:00
Putnam
f6e3a20f85 More tweaks 2020-04-10 20:12:15 -07:00
kevinz000
ba4585951e Merge pull request #11765 from Putnam3145/dynamic-chaos-weight 
Makes intrigue, classic, story storytellers have their chaos weighted by recent round chaos
 2020-04-09 02:40:25 -07:00
kevinz000
956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening 
Punch Changes 2: The Quickening
 2020-04-09 02:09:51 -07:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
Putnam
d43e8052ad More threat swinging 2020-04-06 08:49:19 -07:00
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