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
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
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
Letter N and GitHub
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 and GitHub
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
SandPoot
1561138350
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-16 14:11:00 -03:00
keronshb
6b23d177c8
Merge remote-tracking branch 'upstream/master'
2021-10-15 19:25:41 -04:00
SandPoot
a797436f45
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-15 15:03:21 -03:00
SandPoot and GitHub
bdd0cee2eb
Update ticker.dm
...
shhhh
2021-10-13 19:12:23 -03:00
SandPoot
39a7449625
Update ticker.dm
2021-10-13 16:57:00 -03:00
SandPoot
4d7e1b32db
Update ticker.dm
2021-10-13 16:49:44 -03:00
SandPoot
5153dba0f2
Upload files
2021-10-13 15:11:25 -03:00
SandPoot
37b5020729
biggest fuck-up in the world
2021-10-13 13:56:31 -03:00
keronshb
e2ab532de2
Removes old gangs, families is almost ready
2021-10-12 16:34:27 -04:00
keronshb
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04:00
SandPoot and GitHub
829ca8b9a7
Merge branch 'master' into tgui-alerts-and-what-not
2021-10-11 20:41:56 -03:00
SandPoot
2541ad050b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-10 21:07:48 -03:00
silicons and GitHub
84c6970c27
Merge pull request #15250 from SandPoot/you-are-now-rate-limited
...
You are now rate limited
2021-10-09 22:14:45 -07:00
SandPoot
d55d628efe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-08 21:34:03 -03:00
SandPoot
437b3105d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-08 21:05:41 -03:00
Putnam3145
de51455fac
Dynamic extended rewrite: some antags
2021-10-07 20:50:45 -07:00
Putnam3145 and GitHub
3cfaad31c1
Merge pull request #15149 from keronshb/dynamicport
...
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
Putnam3145 and GitHub
ac84eed0d1
Merge pull request #15129 from Citadel-Station-13/silicons-patch-15
...
if you recognize this is not the way to do it, don't do it (bandaid to polychromatic loadout lookup)
2021-10-07 00:05:06 -07:00
SandPoot
e88368cd4c
Update fail2topic.dm
2021-10-06 16:27:06 -03:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
Tupinambis
f4b365c610
Stopsforcing people into undesired roles when they get antag
2021-10-01 20:46:46 -05:00
keronshb
fb5653e12c
Voting fix
2021-09-25 12:59:18 -04:00
keronshb
a6bfff92cc
Fixes pirates, re adds extended, re adds voting
2021-09-24 19:40:56 -04:00
SandPoot
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03:00
keronshb
c8814e8cc8
Merge remote-tracking branch 'upstream/master' into dynamicport
2021-09-19 18:09:18 -04:00
SandPoot