Lin
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00:00
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
silicons
904990a037
Merge pull request #15584 from Arturlang/StasisBeds
...
Stasis beds
2022-04-08 09:47:26 -07:00
Artur
2100133c4b
Neeewliiines
2022-04-07 14:34:19 +03:00
Artur
c20a847712
Apparently unnecesary
2022-04-07 14:28:38 +03:00
Solaris-Shade
48db01702b
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-04-06 22:31:51 -04:00
Artur
c36019bf56
Adds stasis beds
2022-04-06 15:38:05 +03:00
SandPoot
205c9b3d43
Those are too early.
2022-03-23 12:21:29 -03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
Solaris-Shade
d9ff37d2ff
Merge branch 'Citadel-Station-13:master' into Projectile_Rework
2022-03-19 11:23:16 -04:00
SandPoot
16fddbb140
Upload files
2022-03-18 18:35:29 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
Lin
c25e074128
Merge pull request #15547 from Putnam3145/extend-min-pop
...
Adds a minimum vote count to continue rounds
2022-03-14 18:48:11 +00:00
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
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05: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
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
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
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
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
Putnam3145
13834847e0
it works better when you're actually using a delta
2021-12-11 17:04:05 -08:00
Putnam3145
f21be027d0
am i just eternally wrong
2021-12-08 16:26:34 -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
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04: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
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08: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
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
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
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
