Putnam3145
32803f1cd1
Makes should_do_equalization actually work
2022-03-12 13:54:18 -08:00
Solaris-Shade
0395ba47d7
Merge branch 'master' into Projectile_Rework
2022-03-11 23:07:31 -05:00
Putnam3145
4e2b8949fa
it is important that we actually keep track
2022-03-10 21:47:21 -08:00
Putnam3145
2abe8f1ed6
Actually, no, just a minimum extend vote count
2022-03-10 21:38:39 -08:00
Putnam3145
9b4c3a5be3
Adds a minimum greater vote count to extend rounds
2022-03-10 21:35:08 -08:00
Solaris-Shade
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
BongaTheProto
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
Lin
ae5896d6cf
Merge pull request #15525 from keronshb/ambitioncheck
...
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
silicons
bf9afd846d
Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system
...
[PORT] Removes the non bitflag slot defines
2022-02-26 18:08:28 -07:00
silicons
2ec2c4478d
Merge pull request #15495 from Putnam3145/dynamic_holiday
...
Weekly high-chaos dynamic days
2022-02-26 18:08:04 -07:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
keronshb
0f4a3efcb5
Fixes weird flipped line
2022-02-22 17:26:19 -05:00
keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
PurpleFenn
29315496d8
Added config option for no repeats
2022-02-17 23:19:32 -05:00
PurpleFenn
cb22d5a2cb
Maps 2 Electric Boogaloo
2022-02-17 22:21:28 -05:00
BongaTheProto
b437b03b48
Merge remote-tracking branch 'upstream/master'
2022-02-13 13:40:33 -05:00
SandPoot
5dc331c406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-13 11:51:07 -03:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
BongaTheProto
4876b05297
Merge pull request #177 from SPLURT-Station/ambitions
...
Ambitions from skyrat
2022-02-08 16:21:00 -05:00
BongaTheProto
ffcca5c46b
Merge remote-tracking branch 'upstream/master'
2022-02-08 01:16:02 -05:00
SandPoot
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -03:00
silicons
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
BongaTheProto
5638985734
Merge branch 'ambitions' into pr/176
2022-02-06 20:27:38 -05:00
Putnam3145
3b1304f432
Weekly dynamic days
2022-02-02 17:38:19 -08:00
BongaTheProto
9ce527e068
Merge remote-tracking branch 'upstream/master'
2022-01-26 00:20:29 -05:00
SandPoot
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
silicons
9205545d16
Merge pull request #15317 from LetterN/what-should-i-name-this-branch
...
TGUI hardsync & stuff
2022-01-25 00:06:59 -08:00
BongaTheProto
ed8b355b98
Merge remote-tracking branch 'upstream/master'
2022-01-23 16:09:22 -05:00
SandPoot
3a03ee6475
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-23 16:15:11 -03:00
silicons
f601580854
Merge pull request #15430 from DeltaFire15/synth-coolant
...
Synth stuff : Balancing Nightmare Edition (aka, coolant)
2022-01-22 13:59:12 -08:00
LetterN
18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
BongaTheProto
b45dbf9011
Merge remote-tracking branch 'upstream/master'
2022-01-05 21:19:15 -05:00
SandPoot
c0e1198702
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-05 18:25:05 -03:00
Lin
2379a2a342
Merge pull request #15370 from Putnam3145/genericized-plasma-trit
...
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
2022-01-03 22:31:40 +00:00
DeltaFire
6c5dabe8bc
quirk removal fixes
2022-01-03 06:42:28 +01:00
BongaTheProto
545dba4338
Merge remote-tracking branch 'upstream/master'
2022-01-02 19:50:02 -05:00
SandPoot
9694d84e14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-02 20:56:15 -03:00
BongaTheProto
fc7c58013b
more hyper stuff
...
- added some hilberts to places
- fixed engineer boxes
- added hyper's punishments
- lightning punishment is funnier now
- added rounded noises from hyper
2022-01-02 02:06:35 -05:00
DeltaFire
2940d141cf
please-dont-smite-us-lummox
2022-01-01 07:10:35 +01:00
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
BongaTheProto
3dd0bc8efb
Merge remote-tracking branch 'upstream/master'
2021-12-22 14:30:34 -05:00
SandPoot
e27a6cda5c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-22 15:01:25 -03:00
Putnam3145
f61b638a9e
Fixes excited group process delay heuristic ( #15420 )
2021-12-22 17:38:48 +01:00
LetterN
fab4b07be5
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-12-21 07:59:33 +08:00
BongaTheProto
8d6c4d637c
Merge remote-tracking branch 'upstream/master'
2021-12-15 15:56:36 -05:00
SandPoot
bb7d894944
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-15 17:33:44 -03:00
Putnam3145
13834847e0
it works better when you're actually using a delta
2021-12-11 17:04:05 -08:00
BongaTheProto
49f874311d
Merge remote-tracking branch 'upstream/master'
2021-12-10 13:58:31 -05:00
SandPoot
e21a8445e2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-10 14:53:39 -03:00
