 ariaworld
|
e526ae6dd7
|
New plant sprites
|
2024-09-20 13:46:21 +02:00 |
|
|
ariaworld
|
0601002cd1
|
Space update
|
2024-09-02 00:20:38 +02: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 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -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 |
|
|
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 |
|
|
ariaworldandGitHub
|
0ec0526c3f
|
Merge branch 'SPLURT-Station:master' into december-qol
|
2024-01-08 23:46:12 +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
|
76e7ffc80d
|
push
|
2024-01-06 17:36:02 -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
|
65ed5c79f4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-30 02:07:21 -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 |
|
|
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 |
|
|
SandPoot
|
c9055c4d65
|
minor issue
|
2023-02-21 16:34:10 -03:00 |
|
|
SandPoot
|
e0c8419cdd
|
deal with duct pipes
|
2023-02-21 16:09:35 -03:00 |
|
|
Fabian272
|
939d0bcfd0
|
Changes the kinkmate loincloth to have sensors, changes loincloth crafting to have sensored and sensorless versions.
|
2022-11-07 21:36:42 +01:00 |
|
|
BongaTheProto
|
0b89d8c778
|
Merge remote-tracking branch 'upstream/master'
|
2022-06-20 01:08:17 -05:00 |
|
|
SandPoot
|
25deceb75f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-06-19 23:02:20 -03:00 |
|
|
TripleShades
|
ca57269f66
|
WHY DID THIS NOT GET TESTED EVER
|
2022-06-15 17:29:17 -04:00 |
|
|
BongaTheProto
|
4735651dd4
|
Merge remote-tracking branch 'upstream/master'
|
2022-05-24 09:35:48 -05:00 |
|
|
SandPootandGitHub
|
fac92f66ca
|
You can now make shuttle seats with titanium (#255)
* Update mineral.dm
* consistency
|
2022-05-23 23:04:24 -03:00 |
|
|
BongaTheProto
|
6ada3f7c94
|
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
|
2022-04-18 21:36:14 -05:00 |
|
|
SandPoot
|
05349c27e9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-15 23:43:43 -03:00 |
|
|
BongaTheProto
|
a4fac709c3
|
Merge remote-tracking branch 'upstream/master'
|
2022-04-09 11:43:45 -05:00 |
|
|
SandPoot
|
ada0ea7f32
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-09 02:40:23 -03:00 |
|
|
SandPoot
|
695835fcd6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
|
2022-04-09 00:03:13 -03:00 |
|
|
siliconsandGitHub
|
dee1db4a3a
|
Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
|
2022-04-08 18:26:47 -07:00 |
|
|
SandPoot
|
586a035132
|
Update files
|
2022-04-06 18:41:31 -03:00 |
|
|
BongaTheProtoandGitHub
|
f5af499eee
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-04-06 16:01:25 -05:00 |
|
|
SandPoot
|
66b05f5261
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-06 16:40:58 -03:00 |
|
|
BongaTheProtoandGitHub
|
5a6b1b9dc7
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-04-01 19:42:35 -05:00 |
|
|
SandPootandGitHub
|
c8df97474b
|
Adds pick-up, drop and throw sounds for items. (#240)
|
2022-04-01 15:57:30 -03:00 |
|
|
SandPoot
|
189716314f
|
Would you like some defines in these trying times?
|
2022-03-23 12:10:02 -03:00 |
|
|
SandPoot
|
16fddbb140
|
Upload files
|
2022-03-18 18:35:29 -03:00 |
|
|
BongaTheProto
|
8badaaf8ec
|
the thing
the
|
2022-03-04 19:51:12 -05:00 |
|