 BongaTheProto
|
dbd4505372
|
Merge remote-tracking branch 'upstream/master'
|
2024-04-30 19:02:41 -05: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
|
928cd8fd40
|
Fix invalid box overlays
|
2024-04-16 02:25:18 -04: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
|
bc59c78db0
|
Fix missing junk mail return hint
|
2024-04-16 02:05:36 -04:00 |
|
|
Elizabeth Lavenza
|
322ce2a79c
|
Fix mail bag not holding mail
|
2024-04-16 01:20:59 -04:00 |
|
|
Elizabeth Lavenza
|
b1f0eb3183
|
Fix mail bag not holding mail
|
2024-04-16 01:14:28 -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
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
BongaTheProto
|
65c2092959
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-12 18:40:08 -05:00 |
|
|
SandPoot
|
516ae4a3f0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-12 17:21:56 -03:00 |
|
|
chelandGitHub
|
d08fe3afff
|
Update taperecorder.dm
|
2024-04-11 20:10:50 -03:00 |
|
|
chelandGitHub
|
d2884fd84f
|
Update multitool.dm
|
2024-04-11 20:09:09 -03:00 |
|
|
chelandGitHub
|
cf0e840df4
|
Update wirecutters.dm
|
2024-04-11 20:07:52 -03:00 |
|
|
chelandGitHub
|
85f68480d8
|
Update wrench.dm
|
2024-04-11 20:07:31 -03:00 |
|
|
chelandGitHub
|
315bc7d251
|
Update screwdriver.dm
|
2024-04-11 20:07:13 -03:00 |
|
|
chelandGitHub
|
845f22fe19
|
Update weldingtool.dm
|
2024-04-11 20:06:47 -03:00 |
|
|
chelandGitHub
|
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 |
|
|
SandPoot
|
ca8ce67cd6
|
mail
|
2024-04-10 20:54:04 -03:00 |
|
|
BongaTheProtoandGitHub
|
78d4eaeaaa
|
Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix
Fix harddel issues with 515 upgrade PR
|
2024-04-07 03:16:55 -05:00 |
|
|
Elizabeth Lavenza
|
b3ab704dee
|
Fix bad proc references in core code
|
2024-04-06 20:58:32 -04:00 |
|
|
BongaTheProto
|
dc057a41ad
|
Merge branch 'master' into upstream-merge
|
2024-04-06 18:51:51 -05:00 |
|
|
BongaTheProtoandGitHub
|
40eeadef98
|
Merge pull request #1131 from liz-lavenza/fix/runtimes-one
Fix a large number of runtimes
|
2024-04-06 18:43:43 -05:00 |
|
|
Elizabeth Lavenza
|
ebe7818d1f
|
Fix thrown items runtiming in defense
|
2024-04-01 20:12:11 -04:00 |
|
|
Elizabeth Lavenza
|
77058b4a6b
|
Remove duplicated cyborg premium KA code
|
2024-04-01 16:05:35 -04:00 |
|
|
Elizabeth Lavenza
|
df8035fc9c
|
Fix runtime from putting credit holochips into IDs
|
2024-04-01 11:33:31 -04:00 |
|
|
Elizabeth Lavenza
|
ccfc08b7a8
|
Fix attack_hand-related runtimes
|
2024-04-01 11:33:30 -04:00 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -05:00 |
|
|
ariaworldandGitHub
|
acd33d2d56
|
Merge branch 'SPLURT-Station:master' into monkey-harddels
|
2024-04-01 01:11:24 +02:00 |
|
|
ariaworld
|
0b3ae62833
|
Hopefully fix monkey and slime hard-dels
|
2024-04-01 01:11:03 +02:00 |
|
|
BongaTheProto
|
d20caf7191
|
Merge branch '515-update' into upstream-merge
|
2024-03-24 17:39:24 -05:00 |
|
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -05:00 |
|
|
BongaTheProto
|
8bbb0fda41
|
Merge branch 'master' into upstream-merge
|
2024-03-24 16:41:07 -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
|
8516b07eee
|
please do not end your paths with /
|
2024-03-13 14:43:40 -03:00 |
|
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|