Commit Graph

105 Commits

Author SHA1 Message Date
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
deathride58 e577995c69 Merge pull request #15231 from Tupinambis/Assistantagging
Antag roles will now respect your backup role preferences if none of the enabled roles are available
2022-05-24 14:48:34 -04:00
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPoot e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
Putnam3145 629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
SandPoot cccd49fa5c Update job.dm 2021-11-06 15:42:31 -03:00
SandPoot 80dce37eb4 Upload files 2021-11-06 15:38:13 -03:00
Putnam3145 3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
Tupinambis f4b365c610 Stopsforcing people into undesired roles when they get antag 2021-10-01 20:46:46 -05:00
keronshb 792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
silicons 20b21549fa Update job.dm 2021-09-12 20:21:29 -07:00
silicons 4e22ad7484 Update job.dm 2021-03-21 02:07:03 -07:00
silicons 661ed14c83 Update job.dm 2021-03-21 02:05:43 -07:00
SmArtKar e925aea454 Fixes 2021-02-23 12:44:11 +03:00
SmArtKar b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
SmArtKar fecf879b0c Fixed 2021-02-17 18:54:59 +03:00
SmArtKar 756be084bc Decks are saveable! 2021-02-17 18:50:23 +03:00
SmArtKar 3e95e28f85 Illegal cards will now permanently be marked, not for just one round 2021-02-16 20:05:59 +03:00
SmArtKar 348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
SmArtKar b0c63ea547 Fuck you and your persistence system 2021-02-03 16:43:05 +03:00
timothyteakettle 837e766306 fixes sanitization 2021-01-19 01:04:01 +00:00
Timothy Teakettle b956df2226 name description implement 2021-01-18 21:59:00 +00:00
Blue Wildrose 0e5b2c60ee Fixes loadout specific polychromic hoodies 2020-12-31 03:42:29 -07:00
Timothy Teakettle 132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
Timothy Teakettle ac9e383638 WOOPS ONE MORE DEBUG MESSAGE 2020-12-07 21:28:17 +00:00
timothyteakettle 5566c00a69 fixes 2020-12-06 17:24:12 +00:00
timothyteakettle a478da678e bugfixes 2020-12-06 15:50:33 +00:00
timothyteakettle fa26f4c402 b 2020-12-06 00:02:14 +00:00
Timothy Teakettle afdbac31fa test 2020-12-05 22:35:27 +00:00
timothyteakettle b1379dd49e still not working 2020-10-27 21:11:42 +00:00
timothyteakettle e35b3e4a33 color editing 2020-10-26 00:47:40 +00:00
Timothy Teakettle 0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
timothyteakettle a39dea1b4d json loadout 2020-10-24 00:31:45 +01:00
BlackMajor bf7d68884b Merge pull request #13510 from silicons/google
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
2020-10-11 18:39:10 +13:00
silicons 21d3d8fcd9 sigh 2020-10-03 14:17:13 -07:00
Timothy Teakettle 8f6c353ad0 memory leak bad 2020-09-05 21:35:02 +01:00
Timothy Teakettle e2aeaf8a5b dont need this anymore 2020-08-23 21:55:21 +01:00
Timothy Teakettle a7a6489f58 loadout loading 2020-08-23 21:48:38 +01:00
Timothy Teakettle 31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
Timothy Teakettle 721e018aec loadout stuff 2020-07-28 22:52:00 +01:00
Ghommie c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
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
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02: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 c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
kevinz000 80ffb13f06 bypass joblock 2019-12-15 23:24:43 -07:00
kevinz000 09e5cd95a3 Merge pull request #9690 from Ghommie/Ghommie-cit308
Unmodularize configuration, _globalvars and subsystems.
2019-11-14 15:50:20 -07:00
Ghommie 100a87d57b Unmodularize configuration, _globalvars and subsystems. 2019-11-02 20:42:01 +01:00