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
Putnam3145
43b216707d
linter woes, + disables hangover for now
2021-12-08 17:26:40 -08:00
Putnam3145
f21be027d0
am i just eternally wrong
2021-12-08 16:26:34 -08:00
Putnam3145
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
Putnam3145
5ff8d7c356
grammar unfix
2021-12-08 12:02:07 -08:00
Putnam3145
36c60830dd
should be rounded
2021-12-07 21:17:07 -08:00
Putnam3145
db4c9c1b06
Makes science points show actual change
2021-12-07 21:12:46 -08:00
LetterN
fa6946fae4
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
2021-11-16 16:10:12 +08:00
Putnam3145
1da28b8ec6
Chem gas tweaks, + toxins rebalance
2021-11-15 16:29:30 -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
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
Mosley1f
59b5447a29
Merge branch 'pr/3'
2021-11-04 20:43:45 -05:00
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
LetterN
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
LetterN
49940c373e
tgui backend
2021-10-28 12:51:31 +08:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
SandPoot
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
SandPoot
e5badd2e09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 13:31:55 -03:00
silicons
e5faee5774
Merge pull request #15254 from Putnam3145/dynamic-better-extended
...
Dynamic extended: antags allowed, but only later
2021-10-27 05:15:22 -07:00
