SandPoot
e07874972b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-06-25 01:01:18 -03:00
KrissKr0ss and GitHub
0212870845
Update SDQL_2.dm
2023-06-24 22:41:56 -05:00
SandPoot
8ae64b1bd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-29 19:16:50 -03:00
SandPoot
54641ce201
send
2023-01-23 20:44:28 -03:00
SandPoot
02e4551a27
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-25 22:52:45 -03:00
Lin and GitHub
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
SandPoot
00dadda3df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 23:15:57 -03:00
Putnam3145
e1c822cbd8
TGUI; actually fixes station announcer
2022-08-07 17:17:58 -07:00
Putnam3145
33889870c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-05-17 13:22:40 -07:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
Putnam3145
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
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
silicons and GitHub
bf9afd846d
Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system
...
[PORT] Removes the non bitflag slot defines
2022-02-26 18:08:28 -07:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
SandPoot
c42aa2c30a
Upload files
2022-02-15 22:16:07 -03:00
SandPoot
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -03:00
silicons and GitHub
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
SandPoot
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
LetterN
18b7069f1f
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-11 09:49:38 +08:00
SandPoot
086e3bc704
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-09 23:40:45 -03:00
silicons and GitHub
4de727ce6e
Update SDQL_2.dm ( #15462 )
2022-01-09 16:59:29 +01:00
Putnam3145
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
LetterN
a47a20235f
make possess respect the new audio scheme
2021-11-22 14:20:26 +08:00
SandPoot
34900425aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-17 13:48:32 -03:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
SandPoot
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07: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
67c6cc3fc0
tiny fix
2021-10-27 13:48:34 -03:00
SandPoot
63b34c0712
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-19 14:21:07 -03: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
Lin and GitHub
1f7e65ad01
Merge pull request #15271 from Citadel-Station-13/admin_tickets
...
fixes "answered by <admin>" spam in irc
2021-10-15 23:34:15 -07:00
SandPoot
a797436f45
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-15 15:03:21 -03:00
silicons
d0eade8fe1
fix
2021-10-14 19:20:32 -07:00
DeltaFire
5680b74294
safety
2021-10-11 20:32:00 +02:00
DeltaFire
66e81e7fda
asay ping time
2021-10-11 19:52:30 +02: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
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
silicons
0a75925df9
wack
2021-09-29 06:02:17 -07:00
SandPoot
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03:00
zerothebigboy
06181f51ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
SandPoot
d863f9f437
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-27 15:54:58 -03:00
Putnam
833d34ba8e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-11 16:28:12 -07:00
SandPoot
91fd04c552
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-10 23:41:21 -03:00
SandPoot