 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 |
|
|
Mosley
|
3c63bdc873
|
Merge remote-tracking branch 'upstream/master'
|
2024-11-29 19:41:18 -05:00 |
|
|
SandPoot
|
a103acd509
|
cavalry's here
|
2024-09-10 02:00:55 -03:00 |
|
|
xTheLifex
|
0fbdbb7339
|
cleaning element with range
|
2024-09-09 23:06:55 -03:00 |
|
|
Mosley
|
bd1993e2a8
|
Merge remote-tracking branch 'upstream/master'
|
2024-09-07 15:56:35 -05:00 |
|
|
SandPoot
|
909acfb468
|
push some fixes
|
2024-09-05 22:47:46 -03:00 |
|
|
Mosley
|
e286bd40f3
|
Merge remote-tracking branch 'upstream/master'
|
2024-08-27 15:43:55 -05: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 |
|
|
Mosley
|
91a0b89c9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-08-13 15:07:57 -05:00 |
|
|
SandPoot
|
bc0dc5ee02
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-12 19:54:43 -03:00 |
|
|
SandPoot
|
0fd4dba15b
|
push
|
2024-08-11 14:10:35 -03:00 |
|
|
SandPoot
|
95a30412ad
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-05-25 15:46:29 -03:00 |
|
|
SandPoot
|
5852293116
|
PROC_REF!!!!!!
|
2024-05-22 00:25:21 -03:00 |
|
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05: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
|
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
|
c94743d59c
|
Fix invalid proc references in core code RegisterSignal calls
|
2024-04-06 22:07:53 -04:00 |
|
|
BongaTheProto
|
2709ec887c
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-06 19:06:12 -05:00 |
|
|
BongaTheProto
|
dc057a41ad
|
Merge branch 'master' into upstream-merge
|
2024-04-06 18:51:51 -05: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 |
|
|
Elizabeth Lavenza
|
382cb28b15
|
Fix a number of reported runtimes
|
2024-04-01 11:33:31 -04:00 |
|
|
Elizabeth Lavenza
|
f0ff970b79
|
Fix runtime from mobs escaping off other mobs' heads
|
2024-04-01 11:33:30 -04:00 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -05:00 |
|
|
Elizabeth Lavenza
|
44a5f1fdd0
|
Fix runtime in photosynthesis element Detach()
|
2024-03-28 18:54:35 -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
|
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 |
|
|
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
|
558d33f7c6
|
Merge branch 'master' into upstream-merge
|
2024-03-04 16:59:05 -05:00 |
|
|
BongaTheProtoandGitHub
|
b07d12e225
|
Merge pull request #1093 from xhianil/E621-images
E621 images
|
2024-03-01 21:27:31 -05:00 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
xhianilandGitHub
|
e6cabf5f3d
|
Update flavor_text.dm
Modern, better
|
2024-02-24 18:41:43 -07:00 |
|
|
ariaworld
|
c0306166ba
|
Update headshot info tip
|
2024-02-24 21:42:19 +01:00 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
ariaworldandGitHub
|
0ec0526c3f
|
Merge branch 'SPLURT-Station:master' into december-qol
|
2024-01-08 23:46:12 +01:00 |
|
|
SandPoot
|
003eec1850
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons
|
2024-01-07 02:09:58 -03:00 |
|
|
BongaTheProtoandGitHub
|
8f9a678992
|
Merge branch 'Sandstorm-Station:master' into master
|
2024-01-06 13:46:57 -05:00 |
|
|
SandPoot
|
e30f79b4df
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-05 17:22:43 -03:00 |
|
|
SandPoot
|
05e2cc0979
|
there
|
2024-01-05 00:18:21 -03:00 |
|
|
ariaworld
|
fde8d80de6
|
Merge remote-tracking branch 'upstream/master' into december-qol
|
2024-01-02 21:16:39 +01:00 |
|
|
BongaTheProto
|
a9715638ad
|
Merge remote-tracking branch 'upstream/master'
|
2024-01-02 01:00:59 -05:00 |
|
|
SandPoot
|
3bacf0a1dc
|
push
|
2024-01-01 23:35:28 -03:00 |
|
|
SandPoot
|
4e9ff44ee7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-29 15:49:14 -03:00 |
|
|
deathride58andGitHub
|
ce1d757159
|
Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
|
2023-12-28 22:44:59 -05:00 |
|