353e81e8ce
Merge remote-tracking branch 'upstream/master'
2024-05-29 17:56:50 -05:00
95a30412ad
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-05-25 15:46:29 -03:00
587f92e900
Merge pull request #16092 from SandPoot/update_manifest
...
Crew manifest TGUI
2024-05-25 14:01:48 -04:00
ad0f659226
push
2024-05-23 21:53:15 -03:00
98b017831c
final
2024-05-22 00:22:05 -03:00
7f953a03af
listener update
2024-05-22 00:06:08 -03:00
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
116c048d9c
Merge branch 'Sandstorm-Station:master' into master
2024-01-09 17:50:17 -05:00
6183d05fd5
fix camera circuit
2024-01-09 16:34:33 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
d08cb554e9
Merge branch 'master' into pr/660
2023-02-13 14:09:17 -05:00
ce464a6903
Merge remote-tracking branch 'upstream/master'
2023-02-11 21:25:29 -05:00
b62b5c3e12
fix more alt titles
2023-02-11 14:02:22 -03:00
8a53e33271
Merge branch 'master' into pr/660
2023-01-28 22:11:29 -05:00
620380e188
Merge remote-tracking branch 'upstream/master'
2023-01-21 13:15:29 -05:00
0ebcf0b72f
stuff
2023-01-16 18:16:32 -03:00
580bd31e12
Stowaways Role
2022-12-27 11:45:20 +03:00
ee6823c69b
Merge remote-tracking branch 'upstream/master'
2022-12-13 12:14:11 -05:00
7205781c47
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
...
Solves some harddels
2022-12-12 19:11:49 -07:00
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
a1c93d4767
Merge branch 'Sandstorm-Station:master' into master
2022-11-09 19:12:06 -05:00
4a8abd0843
Revert "no more free money ( #15375 )"
...
This reverts commit cb1848d06c
2022-10-31 00:01:44 -05:00
79fa770ab3
Merge remote-tracking branch 'upstream/master'
2022-10-13 11:21:32 -05:00
cdb1fbb1e2
port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic.
2022-09-18 21:55:10 -07:00
3341812b44
Merge remote-tracking branch 'upstream/master'
2022-08-20 17:16:19 -05:00
5b221dc354
Makes signal commander work
2022-08-18 23:01:47 -07:00
9e7c5033cc
Merge remote-tracking branch 'upstream/master'
2022-08-07 21:42:16 -05:00
b2d816b825
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-08-07 17:59:28 -07:00
b6d62780c2
fix
2022-08-04 11:06:16 +08:00
8652fc82a9
was less than I thought
...
yeah this works ig
2022-05-09 17:33:28 -05:00
6199aa4d60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-03-30 12:35:12 -07:00
cb1848d06c
no more free money ( #15375 )
2022-03-13 12:50:30 -07:00
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
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
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
9dbcfa24a5
i only KINDA tested this
2021-09-07 22:28:04 -05:00
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
3b25f3e199
Started expanding auxgm a bit
2021-06-10 04:40:23 -07:00
715f86ef5c
Merge pull request #14447 from LetterN/fixes-2
...
Fixes laptop and tweaks stacks
2021-03-22 19:52:42 -05:00
86b8bbf727
no more free shipping
2021-03-21 21:44:04 +08:00
8d9c4f55d6
no dumb names
2021-03-21 13:51:08 +08:00
BongaTheProto