 Mosley
|
0d9eebd20c
|
Merge remote-tracking branch 'upstream/master'
|
2025-04-24 17:03:15 -05:00 |
|
|
SandPoot
|
a2aa92cbc4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-01-24 02:08:58 -03:00 |
|
|
ariaworldandGitHub
|
44e507dfef
|
[BEESTATION PORT] Semi-Port of Beestation Decal Fixes, Fixes turf decals disappearing on shuttle movements (#16119)
* SEMI-PORT OF BEESTATION PR #3111: Decal fixes
* Forgot this, rotate flag
|
2025-01-24 01:47:50 -03:00 |
|
|
SaraandGitHub
|
7c9852b115
|
Merge branch 'SPLURT-Station:master' into 4nal
|
2024-08-25 12:27:54 -06:00 |
|
|
Mosley
|
106d5b3c1e
|
Merge remote-tracking branch 'upstream/master'
|
2024-08-25 12:48:45 -05:00 |
|
|
SandPoot
|
a1905591f7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-24 23:49:10 -03:00 |
|
|
SandPoot
|
ac2a5d8eef
|
fix for custom shuttles
|
2024-08-24 23:06:50 -03:00 |
|
|
SandPoot
|
09aa0f704f
|
set those up
|
2024-08-24 21:41:21 -03:00 |
|
|
SandPoot
|
c07e94be66
|
push
|
2024-08-24 21:28:55 -03:00 |
|
|
xhianil
|
f469776770
|
Initial finish
My first 'finished' pass on the new map.
|
2024-08-08 13:37:17 -06:00 |
|
|
BongaTheProto
|
dbd4505372
|
Merge remote-tracking branch 'upstream/master'
|
2024-04-30 19:02:41 -05:00 |
|
|
SandPoot
|
91a9223df6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-25 17:08:42 -03:00 |
|
|
deathride58
|
0517ece12a
|
fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon
|
2024-04-24 22:30:25 -04:00 |
|
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05:00 |
|
|
SandPoot
|
2e2528ee56
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-13 00:36:29 -03:00 |
|
|
deathride58andGitHub
|
dd8c641520
|
Merge pull request #15486 from SandPoot/kills-cache
Solves issues with overlays by updating the whole subsystem
|
2024-04-12 23:31:54 -04:00 |
|
|
SandPoot
|
09ec69830f
|
synd
|
2024-04-12 23:00:59 -03:00 |
|
|
SandPoot
|
002a4c31c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-12 22:06:15 -03:00 |
|
|
SandPoot
|
984d7ffe9a
|
holiday and quirk support
|
2024-04-10 22:51:25 -03:00 |
|
|
SandPoot
|
ca8ce67cd6
|
mail
|
2024-04-10 20:54:04 -03:00 |
|
|
SandPoot
|
c2df4281b9
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-05 23:31:50 -03:00 |
|
|
SandPoot
|
68fa21d602
|
content
|
2024-04-05 17:57:54 -03:00 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -05:00 |
|
|
Elizabeth Lavenza
|
dd709f0483
|
Fix requests console harddel
|
2024-03-29 17:22:50 -04:00 |
|
|
Elizabeth Lavenza
|
90378d4da9
|
Fix direct Destroy calls
|
2024-03-28 18:18:31 -04:00 |
|
|
Elizabeth Lavenza
|
3b82d15358
|
Fix requests consoles harddeling due to arrivals mobile docking port
|
2024-03-28 18:14:49 -04:00 |
|
|
Elizabeth Lavenza
|
95f87dbc38
|
Fix engines harddeling due to mobile docking ports
|
2024-03-28 07:40:47 -04:00 |
|
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -05:00 |
|
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
|
SandPoot
|
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 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
CSDSP
|
a7ae549f38
|
Allow custom shuttles to get to centcom
|
2024-02-17 02:00:49 -08:00 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPoot
|
a558377206
|
more stuff i can't guarantee works by itself yet
|
2023-11-29 23:37:15 -03:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
BongaTheProto
|
e3d1286cb8
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-23 17:23:16 -05:00 |
|
|
SandPoot
|
c519c1e128
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-11-21 15:00:51 -03:00 |
|
|
SandPoot
|
44421ed042
|
push
|
2023-11-03 23:46:34 -03:00 |
|
|
BongaTheProto
|
085bb06e94
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-16 14:32:38 -05:00 |
|
|
SandPoot
|
0b04af4b76
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-14 22:32:47 -03:00 |
|
|
SandPoot
|
3c7e79d384
|
do after update
|
2023-09-09 15:39:49 -03:00 |
|
|
BongaTheProto
|
a949e5d08c
|
Merge remote-tracking branch 'upstream/master'
|
2022-10-28 16:43:28 -05:00 |
|
|
SandPoot
|
02e4551a27
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-10-25 22:52:45 -03:00 |
|
|
LinandGitHub
|
03c62f4359
|
Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
Fixes deadchat_broadcast
|
2022-10-25 04:36:00 +00:00 |
|
|
SandPoot
|
24ee6077c7
|
push changes
|
2022-10-23 00:18:03 -03:00 |
|
|
BongaTheProtoandGitHub
|
4a4f4aaa54
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-10-18 23:18:56 -05:00 |
|
|
SandPoot
|
1607d9ead8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-10-19 00:54:33 -03:00 |
|
|
shellspeed1
|
dfddbc23c3
|
ports https://github.com/tgstation/tgstation/pull/53603 Credit to TiviPlus
|
2022-09-22 01:10:08 -07:00 |
|
|
KyleraceandZirok
|
5d2d68edc4
|
Cherry-pick the merge commit for tgstation PR 58991, implementing underlay Lighting
Implements underlay lighting, turning lightin objects into a datum, for details see the tgstation PR.
|
2022-09-02 18:22:15 +02:00 |
|