 Mosley
|
0d9eebd20c
|
Merge remote-tracking branch 'upstream/master'
|
2025-04-24 17:03:15 -05:00 |
|
|
SandPoot
|
2d87780147
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-02-13 18:06:56 -03:00 |
|
|
SandPoot
|
56d972eb0b
|
all sorts of fixes and updates, may break stuff
|
2025-02-09 02:09:28 -03:00 |
|
|
Elizabeth Lavenza
|
e2b6a36ca3
|
Blacklist abstract template types from C&D
|
2024-04-16 00:43:43 -04:00 |
|
|
Elizabeth Lavenza
|
aafce505f3
|
Fixes some actual harddels
|
2024-04-07 00:32:10 -04: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
|
b6f848127a
|
Fix runtimes from ashwalker eggs gibbing during CI
|
2024-03-29 17:22:50 -04:00 |
|
|
Elizabeth Lavenza
|
710e81d0e8
|
Blacklist ashwalker eggs from Create and Destroy
|
2024-03-29 17:22:50 -04:00 |
|
|
Elizabeth Lavenza
|
38c2c1b30e
|
Fix potential harddels in vore unit tests.
|
2024-03-29 17:22:50 -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 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
BongaTheProto
|
8705bd668b
|
Update create_and_destroy.dm
|
2024-01-09 16:09:05 -05:00 |
|
|
BongaTheProto
|
98abbeeab5
|
Update create_and_destroy.dm
|
2024-01-08 17:17:45 -05:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
BongaTheProto
|
a9715638ad
|
Merge remote-tracking branch 'upstream/master'
|
2024-01-02 01:00:59 -05:00 |
|
|
SandPoot
|
65ed5c79f4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-30 02:07:21 -03:00 |
|
|
BongaTheProto
|
bc5a87cdb2
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-18 21:22:28 -05:00 |
|
|
SandPoot
|
e8f20d073a
|
fix unit tests
|
2023-12-16 17:34:34 -03:00 |
|
|
SandPoot
|
cf30d74867
|
push
|
2023-12-16 17:20:55 -03:00 |
|
|
SandPoot
|
35723b9bd7
|
field access...
|
2023-12-13 12:55:33 -03:00 |
|
|
SandPoot
|
606ffd5b1e
|
just get rid of these issues already
|
2023-12-13 12:52:50 -03:00 |
|
|
SandPoot
|
c182a337fe
|
poosh
|
2023-12-13 00:24:57 -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
|
b6dc33fb2e
|
modular map loader
yep
|
2023-08-18 20:04:20 -05:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
BongaTheProto
|
dfdbd259da
|
unit test
this is the easy part, believe it or not
|
2023-08-08 14:01:13 +03:00 |
|
|
SandPoot
|
89fa5c0bfe
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-05-21 00:13:59 -03:00 |
|
|
SandPoot
|
da1f58f297
|
Update files
|
2022-05-19 13:23:17 -03:00 |
|
|
SandPoot
|
771f468ba6
|
Interaction Panel Upgrade Again! (#250)
* Upload files
* command is now deprecated
* cooldown defines!
|
2022-05-06 14:58:58 -03:00 |
|
|
SandPoot
|
9df4ed8253
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-09 02:48:16 -03:00 |
|
|
Solaris-Shade
|
c5be81c589
|
tg moved projectiles out of /item, added '/item' back
|
2022-03-06 16:29:58 -05:00 |
|
|
SandPoot
|
fb7a24b333
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-02-27 14:17:53 -03:00 |
|
|
SandPoot
|
c0e1198702
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-01-05 18:25:05 -03:00 |
|
|
Putnam3145
|
b9f5b70dd3
|
Reaction unit test shouldn't do disabled ones
|
2021-11-14 10:17:50 -08:00 |
|
|
SandPoot
|
983fc006a3
|
Makes interactions generation into a subsystem (#188)
* Upload files
* Update interactions.dm
|
2021-11-01 00:27:07 -03:00 |
|
|
SandPoot
|
d55d628efe
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-08 21:34:03 -03:00 |
|
|
keronshb
|
f2b7dba990
|
More fixes?
|
2021-09-15 18:52:24 -04:00 |
|
|
keronshb
|
edde5043dd
|
More fixes, more errors
|
2021-09-15 15:55:59 -04:00 |
|
|
keronshb
|
7ed5f622f4
|
Dynamic
|
2021-09-14 19:33:17 -04:00 |
|
|
SandPoot
|
51fdbc73d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-09-10 23:14:02 -03:00 |
|
|
LetterN
|
688c8b8a90
|
what an idiot. properly fixes eco out at roundend
|
2021-09-08 11:06:13 +08:00 |
|
|
LetterN
|
d08cd16752
|
fix
|
2021-09-08 10:56:20 +08:00 |
|
|
LetterN
|
12ae614833
|
fix1
|
2021-09-08 10:22:55 +08:00 |
|
|
LetterN
|
93332462f3
|
unit test update
|
2021-09-08 10:08:20 +08:00 |
|