 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 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -05: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 |
|
|
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 |
|
|
BongaTheProto
|
1883c47d5c
|
basic ref regex
makes the proc calls compatible with 515
|
2024-03-11 19:46:05 -05: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 |
|
|
Ayy-RoboticsandGitHub
|
91c0f70101
|
Update sheet_types.dm with Cultmagic Bypass
So blood cultists can use Runed Metal!
|
2024-02-19 01:02:58 -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 |
|
|
ariaworld
|
20a6f0d04d
|
Merge remote-tracking branch 'upstream/master' into infinidorms-hotel-update
|
2024-01-12 23:54:29 +01:00 |
|
|
ariaworldandGitHub
|
0ec0526c3f
|
Merge branch 'SPLURT-Station:master' into december-qol
|
2024-01-08 23:46:12 +01:00 |
|
|
ariaworldandGitHub
|
20cd41f195
|
Merge branch 'SPLURT-Station:master' into infinidorms-hotel-update
|
2024-01-08 23:46:05 +01:00 |
|
|
BongaTheProtoandGitHub
|
8e8999fa08
|
Merge branch 'Sandstorm-Station:master' into master
|
2024-01-07 19:58:34 -05:00 |
|
|
SandPoot
|
46384d2a67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-07 03:36:25 -03: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 |
|
|
ariaworld
|
4863b89009
|
Infinidorms update!
|
2024-01-07 04:57:04 +01:00 |
|
|
deathride58andGitHub
|
6c601f18fb
|
Merge pull request #16054 from SandPoot/solves-borg-mat-storage-issues
Solves borg material storage issues
|
2024-01-06 22:50:27 -05:00 |
|
|
SandPoot
|
8eab55aaa6
|
fix stacks leaving stuff in unexpected ways
|
2024-01-06 18:56:46 -03:00 |
|
|
SandPoot
|
f497c4d09e
|
delete if not in borg
|
2024-01-06 18:56:17 -03:00 |
|
|
SandPoot
|
76e7ffc80d
|
push
|
2024-01-06 17:36:02 -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
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPootandGitHub
|
e5146066eb
|
Update code/game/objects/items/stacks/stack.dm
|
2024-01-03 18:51:09 -03:00 |
|
|
ariaworld
|
fde8d80de6
|
Merge remote-tracking branch 'upstream/master' into december-qol
|
2024-01-02 21:16:39 +01:00 |
|
|
SandPoot
|
b82dd9d7a5
|
no "ALL" option
|
2024-01-02 14:16:10 -03: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
|
20d80858b6
|
solve minor issues real quick
|
2023-12-31 15:53:38 -03:00 |
|
|
SandPoot
|
111d4d3619
|
e
|
2023-12-30 02:32:36 -03:00 |
|
|
SandPoot
|
65ed5c79f4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-30 02:07:21 -03:00 |
|
|
SandPoot
|
272879367f
|
solution for numerical display bags
|
2023-12-30 00:31:57 -03:00 |
|
|
SandPoot
|
6733de69bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks
|
2023-12-29 23:16:11 -03:00 |
|
|
BongaTheProto
|
13cd269788
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-25 14:28:51 -05:00 |
|
|
SandPoot
|
be37603291
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-23 13:28:41 -03:00 |
|
|
ariaworld
|
22befe7327
|
Winter QOL
|
2023-12-23 14:59:11 +01:00 |
|
|
SandPoot
|
7b62dbe7bb
|
ai + mech
|
2023-12-17 23:15:59 -03:00 |
|
|
SandPoot
|
7533d51ae4
|
is_cyborg
|
2023-12-13 13:07:10 -03:00 |
|
|
SandPoot
|
f626df9d1d
|
push
|
2023-12-13 00:08:58 -03:00 |
|
|
SandPoot
|
a558377206
|
more stuff i can't guarantee works by itself yet
|
2023-11-29 23:37:15 -03:00 |
|
|
BongaTheProto
|
085bb06e94
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-16 14:32:38 -05:00 |
|
|
SandPoot
|
0b04af4b76
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-14 22:32:47 -03:00 |
|
|
SandPoot
|
3c7e79d384
|
do after update
|
2023-09-09 15:39:49 -03:00 |
|
|
BongaTheProto
|
2151624f10
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-22 19:14:08 -05:00 |
|
|
SandPootandSandPoot
|
2bdec078d7
|
Merge pull request #311 from Sandstorm-Station/duct-piping
Several duct pipe fixes/qol
|
2023-02-21 16:44:35 -03:00 |
|