 SandPoot
|
a085c514d6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2026-02-15 15:41:52 -03:00 |
|
|
SandPoot
|
40be4145c4
|
push
|
2026-02-09 21:30:28 -03:00 |
|
|
SandPoot
|
7a7f949de4
|
this was bugging me
|
2026-02-08 23:37:45 -03:00 |
|
|
SandPoot
|
fed1634cf6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-11-19 16:23:37 -03:00 |
|
|
YakumoChen
|
6e77788a4b
|
adds Chen plush
|
2025-10-25 16:36:04 -04:00 |
|
|
SandPoot
|
e531826f7d
|
some fixes
|
2025-06-08 14:07:44 -03: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 |
|
|
SandPoot
|
76042510df
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-01-28 19:21:39 -03:00 |
|
|
SandPoot
|
cae94afdb7
|
push
|
2025-01-26 18:06:36 -03:00 |
|
|
SandPoot
|
e3a3ca5892
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-01-04 23:24:59 -03:00 |
|
|
SandPoot
|
66cc8cf50f
|
push
|
2025-01-01 20:20:16 -03:00 |
|
|
SandPoot
|
7fa5456cb1
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 into pr/xTheLifex/388
|
2024-10-20 18:29:55 -03:00 |
|
|
SandPoot
|
e2cc28d21d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-10-20 18:05:53 -03:00 |
|
|
Metis
|
a5e9ae8bc6
|
Update RCD.dm
|
2024-10-15 00:41:11 -04:00 |
|
|
xTheLifex
|
5206550e3c
|
Ligthers
|
2024-09-06 12:15:33 -03:00 |
|
|
SandPoot
|
75d1a7d69c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-26 04:31:35 -03:00 |
|
|
SandPoot
|
dc08550162
|
push
|
2024-08-25 04:38:03 -03: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
|
c07e94be66
|
push
|
2024-08-24 21:28:55 -03:00 |
|
|
SandPoot
|
62f858a154
|
this one too
|
2024-05-29 18:49:16 -03:00 |
|
|
SandPoot
|
5023ba4fc8
|
just so it appears in the right spot
|
2024-05-29 18:48:07 -03:00 |
|
|
SandPoot
|
e31747dc08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-05-20 18:55:33 -03:00 |
|
|
SandPoot
|
7832dbdba4
|
push
|
2024-05-20 18:25:24 -03:00 |
|
|
SandPoot
|
043b9d6ff9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-29 17:45:58 -03:00 |
|
|
SandPoot
|
691ac44a6a
|
holidays is an assoc list
|
2024-04-29 17:04:39 -03: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 |
|
|
SandPoot
|
4c25ac80a7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-16 18:25:10 -03:00 |
|
|
Elizabeth Lavenza
|
e57c803e3a
|
Fix invalid box overlays
|
2024-04-16 02:19:36 -04:00 |
|
|
Elizabeth Lavenza
|
c69f30e846
|
Fix missing junk mail return hint
|
2024-04-16 02:12:46 -04:00 |
|
|
Elizabeth Lavenza
|
b1f0eb3183
|
Fix mail bag not holding mail
|
2024-04-16 01:14:28 -04:00 |
|
|
SandPoot
|
2e2528ee56
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-13 00:36:29 -03:00 |
|
|
deathride58
|
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
|
8b5bb50a7a
|
defib
|
2024-04-12 23:29:18 -03:00 |
|
|
SandPoot
|
583a95d242
|
if ratio'd
|
2024-04-12 23:14:08 -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 |
|
|
deathride58
|
bbc977ee92
|
Merge pull request #16072 from SandPoot/mail
Adds mail to cargo
|
2024-04-12 20:42:29 -04:00 |
|
|
SandPoot
|
dfe90dfb61
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SandPoot/15486
|
2024-04-12 20:48:41 -03:00 |
|
|
SandPoot
|
516ae4a3f0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-12 17:21:56 -03:00 |
|
|
chel
|
d08fe3afff
|
Update taperecorder.dm
|
2024-04-11 20:10:50 -03:00 |
|
|
chel
|
d2884fd84f
|
Update multitool.dm
|
2024-04-11 20:09:09 -03:00 |
|
|
chel
|
cf0e840df4
|
Update wirecutters.dm
|
2024-04-11 20:07:52 -03:00 |
|
|
chel
|
85f68480d8
|
Update wrench.dm
|
2024-04-11 20:07:31 -03:00 |
|
|
chel
|
315bc7d251
|
Update screwdriver.dm
|
2024-04-11 20:07:13 -03:00 |
|
|
chel
|
845f22fe19
|
Update weldingtool.dm
|
2024-04-11 20:06:47 -03:00 |
|
|
chel
|
72be1ae5a9
|
Update crowbar.dm
|
2024-04-11 20:06:24 -03:00 |
|
|
SandPoot
|
d7062bd9bc
|
typo from tg (real)
|
2024-04-11 13:35:43 -03:00 |
|
|
SandPoot
|
984d7ffe9a
|
holiday and quirk support
|
2024-04-10 22:51:25 -03:00 |
|
|
SandPoot
|
c16af5deed
|
no joke, thanks linters check
|
2024-04-10 21:01:35 -03:00 |
|