 BongaTheProtoandGitHub
|
7d7ce3dc1c
|
Merge pull request #928 from SpaceCheetah/master
Hydroponics plumbing
|
2023-09-23 17:11:54 -05: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 |
|
SpaceCheetah
|
3a2d43c055
|
Allow trays to accept input from all directions
|
2023-08-12 07:08:59 -07:00 |
|
SpaceCheetah
|
5fb95feef1
|
Disable plumbing on unanchored trays
|
2023-08-11 23:27:36 -07:00 |
|
BongaTheProto
|
811c1df810
|
Merge remote-tracking branch 'upstream/master'
|
2022-07-24 12:05:49 -05:00 |
|
SandPoot
|
0a0e4de14b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-07-24 02:59:28 -03:00 |
|
Cognition
|
ca414ca712
|
Grown inedibles now properly take seed stats into account
|
2022-07-22 16:32:05 -06: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
|
3a8140d646
|
fixes growth state display for cannabis
|
2022-06-15 16:41:54 -04: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
|
2555843026
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
|
2022-04-09 03:06:56 -03:00 |
|
SandPoot
|
9df4ed8253
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-09 02:48:16 -03:00 |
|
SandPoot
|
ada0ea7f32
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-09 02:40:23 -03:00 |
|
 LinandGitHub
|
fd286c325e
|
Merge branch 'master' into Projectile_Rework
|
2022-04-09 04:19:56 +00: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 |
|
SandPoot
|
586a035132
|
Update files
|
2022-04-06 18:41:31 -03:00 |
|
SandPoot
|
189716314f
|
Would you like some defines in these trying times?
|
2022-03-23 12:10:02 -03:00 |
|
BongaTheProto
|
7dc36994a9
|
Merge remote-tracking branch 'upstream/master'
|
2022-03-14 13:31:20 -05:00 |
|
 SandPootandGitHub
|
e466f47992
|
Replaces infoboxes with examine blocks (#235)
|
2022-03-14 14:22:18 -03:00 |
|
Solaris-Shade
|
2fdb70b2b9
|
[DNM][DNM][WIP] Projectile backend code port and update
Ports#54924, #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
|
2022-03-06 15:20:23 -05:00 |
|
 BongaTheProtoandGitHub
|
93016e7568
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-02-16 16:03:32 -05:00 |
|
SandPoot
|
bf69229ada
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-02-16 17:18:56 -03:00 |
|
silicons
|
984f37cc80
|
fix
|
2022-02-15 22:03:27 -07:00 |
|
silicons
|
ce6e8c99c6
|
fixes
|
2022-02-15 21:56:36 -07:00 |
|
BongaTheProto
|
91efbfc48d
|
Removes walking mushroom
fuck
|
2022-02-12 18:40:23 -05:00 |
|
James
|
03ff1f8e41
|
Fixes to_chat.dm hydroponics runtime
|
2022-02-05 08:22:56 +00:00 |
|
SandPoot
|
28cc02d653
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-01-22 17:18:15 -03:00 |
|
Putnam3145
|
c392b7c3fb
|
Allows pod people to be made using other fluids
|
2021-12-31 14:36:55 -08:00 |
|
 SandPootandGitHub
|
be30713a2a
|
Fixes circuit harvesting (#198)
|
2021-11-19 19:20:19 -03:00 |
|
SandPoot
|
34900425aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-11-17 13:48:32 -03:00 |
|
DeltaFire
|
6224da71a3
|
contents_explosion
at least this one had less overrides.
|
2021-11-14 21:41:42 +01:00 |
|
DeltaFire
|
6aa906395c
|
not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
|
2021-11-14 21:34:59 +01:00 |
|
SandPoot
|
3da59fc38c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-11-05 14:27:17 -03:00 |
|
SandPoot
|
f1f6ac0109
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-31 22:14:23 -03:00 |
|
silicons
|
186b552103
|
merge
|
2021-10-29 21:50:58 -07:00 |
|
 Letter NandGitHub
|
bcdf96f274
|
Revert "TGUI alerts, lists, inputs"
|
2021-10-28 12:17:29 +08:00 |
|
SandPoot
|
32a6e63698
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-27 23:11:54 -03:00 |
|
SandPoot
|
5aa12b4716
|
There's a bounty for this right? i spent nearly two full days at this
|
2021-10-05 18:10:32 -03:00 |
|
SandPoot
|
bbe32fa38a
|
Upload files
|
2021-10-05 00:33:49 -03:00 |
|
SandPoot
|
be2a85d9d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-03 15:41:30 -03:00 |
|
SandPoot
|
e7d5275a70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-09-20 14:32:29 -03:00 |
|
 WanderingFox95andGitHub
|
fe8a652689
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-09-19 21:32:03 +02:00 |
|
Putnam3145
|
b5890f60a7
|
Massively reduced oxygen req for bonfire
|
2021-09-17 15:50:20 -07:00 |
|
SandPoot
|
4b1df1bfb3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-09-13 10:18:55 -03:00 |
|
zerothebigboy
|
ccfde52b0d
|
code
|
2021-09-02 23:45:03 -04:00 |
|