Commit Graph

322 Commits

Author SHA1 Message Date
Putnam3145
e63dc08e66 More dynamic fixes, AKA if Ghommie keeps merging without telling me I will maybe get irate (#11688)
* 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.

* Make roundstarts ignore current threat

It's not even calculated yet, so this is probably better.

* Minimum pop for chaotic/teamwork.

* More conveyance issues, removed superfluous threat costs

* More conveyance and tweaks

* Makes storyteller min players use all players instead of ready

* Lowered chaos weight with chaotic

* Blob now has correct cost

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-31 13:10:59 +02: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
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
Ghom
ff3e394402 OH NO 2020-03-22 03:25:27 +01:00
Ghommie
6d4433dd77 Size preferences made configurable. 2020-03-22 01:07:51 +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
Ghom
8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
deathride58
560192c45a Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate 2020-03-03 15:49:25 -05:00
BlackMajor
be740ba690 Merge branch 'master' into SpaceRuins 2020-02-26 20:58:46 +13:00
Ghom
5ee2f0dcd8 Merge pull request #11169 from PersianXerxes/ohHeyKilo
Ports Kilo Station from Skyrat
2020-02-25 14:48:37 +01:00
BlackMajor
fc85f62546 Merge branch 'master' into SpaceRuins 2020-02-25 16:51:39 +13:00
Ghom
9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
2020-02-24 16:39:16 +01:00
kevinz000
43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
2020-02-24 02:30:36 -07:00
BlackMajor
ca6341aac4 Merge branch 'master' into SpaceRuins 2020-02-24 19:47:52 +13:00
Persi
4af2eee9dd Haha, okay... this will break Kilo
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
2020-02-23 02:28:18 -05:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Persi
c4b4a90bd8 Oh hey it's KiloStation
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
2020-02-20 00:58:54 -05:00
Hatterhat
0ad49f9004 shit dude i hope this works lmao 2020-02-19 17:18:51 -06:00
BlackMajor
9a54b451eb Added two more ruins, Owai's suggestions. 2020-02-18 12:57:48 +13:00
BlackMajor
aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13:00
Hatterhat
c00f797a4a extendies 2020-02-16 01:26:33 -06:00
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler
ports auto profiler subsystem from tg
2020-02-13 15:06:27 +01:00
kevinz000
1ec098b39e shhhh 2020-02-11 08:00:56 -07:00
kevinz000
275fb6fc41 auto profiler 2020-02-11 07:54:17 -07:00
Ghommie
0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
Ghom
c2baad44d8 Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit
ENDS THE PLUSHIE DRAMA
2020-02-09 21:47:30 +01:00
kevinz000
1f959012c5 Merge pull request #10918 from r4d6/dwarf-config
Add dwarves as a round-start race
2020-02-08 21:01:26 -07:00
Putnam
d05c2426a8 Added a config for map voting types. 2020-02-06 15:47:04 -08:00
kevinz000
62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
r4d6
949587d671 dorf config 2020-02-05 11:48:19 -05:00
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
Ghom
c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker
Save panic bunker between rounds
2020-02-04 21:15:37 +01:00
kevinz000
8910efadfa Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-02-03 13:07:49 -07:00
Putnam
52432ed0a7 too many dynamic changes for my sanity 2020-02-03 07:12:27 -08:00
Putnam
82fbef9920 Made it real time, added to config 2020-02-03 03:13:19 -08:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghom
d19b7a7695 Merge pull request #10744 from r4d6/Moar-Engines
Moar engines!
2020-02-01 19:11:10 +01:00
deathride58
74d0fe2770 fixes spacemen going at lightspeed on local/testing servers 2020-01-28 00:18:54 -05:00
r4d6
4884165d4f Add TEG, Code & config 2020-01-26 20:58:16 -05:00
kevinz000
12c832b40b Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit 2020-01-20 17:53:06 -07:00
Ghom
8a091c5140 Merge pull request #10614 from Putnam3145/suicide_option
Made suicide a config flag
2020-01-20 03:24:00 +01:00
Putnam
1bdb515592 made suicide a config flag 2020-01-19 03:44:45 -08:00
Ghom
07b3bac674 Merge pull request #10580 from Putnam3145/craft-log
Craft logging
2020-01-18 17:47:31 +01:00
Putnam
a4cc73f219 some craft logging 2020-01-16 18:40:00 -08:00
kevinz000
90dd0909b8 Merge branch 'master' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into god_wish_your_plushies_holy_shit 2020-01-12 10:25:50 -08:00
kevinz000
8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08:00
Putnam3145
3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00