Commit Graph
2368 Commits
Author SHA1 Message Date
MysteryMan21333 6e578ccf28 V1.0 2023-11-25 04:30:19 -06:00
BongaTheProto e3d1286cb8 Merge remote-tracking branch 'upstream/master' 2023-11-23 17:23:16 -05:00
SandPoot c519c1e128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-11-21 15:00:51 -03:00
5dc2241d6a Syndicate Skinned Box Station (#15580)
* Syndicate Skinned Box Station

* Create syndicatestation.json

Okay tHIS FIXED IT I THINK HOLY CRAP THIS WAS AN EXPERIENCE.  HERES THE JSON!

* actually makes this work

* random runtime

we lvoe lesser-used items with runtiming actions

---------

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2023-11-13 12:48:38 +01:00
54089a159c SpookyStation fixes and edits (#16019)
* spooky 2023

* Spooky colormates, better telecomms?

* yes

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* yes

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* minor pre-merge change

I don't feel like requesting changes for this small of a nitpick so I'll just do it myself & merge.

---------

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2023-11-13 10:02:31 +01:00
MysteryMan21333 d7342a58aa V1,6 2023-11-08 16:00:35 -06:00
SandPoot 44421ed042 push 2023-11-03 23:46:34 -03:00
MysteryMan21333 d531582546 Xenobiology V1.5 2023-10-14 07:50:18 -05:00
BongaTheProtoandGitHub a04c0dda6f Merge pull request #944 from Vhariik/Dum
Adds shuttle nav beacons to every space ruins
2023-09-07 21:41:26 -05:00
BongaTheProto 35c3dd0288 salvaging
yippee
2023-09-05 18:14:31 -05:00
Vhariik 04c976de9d adds navbeacons 2023-08-27 09:41:26 -03:00
Vhariik 4953f5d47e Revert "IceBox"
This reverts commit 0c1a892b09.
2023-08-21 19:19:39 -03:00
Vhariik 0c1a892b09 IceBox 2023-08-21 19:18:49 -03:00
Vhariik 5cb230313c Update layeniastation.dmm 2023-08-17 23:31:02 -03:00
Vhariik 76bda47b46 Update layeniastation.dmm 2023-08-13 00:39:19 -03:00
Vhariik 489ad517b1 Update layeniastation.dmm 2023-08-08 12:52:47 -03:00
Vhariik 9529c916a8 Update layeniastation.dmm 2023-08-04 23:17:57 -03:00
Vhariik 63855f3245 Update layeniastation.dmm 2023-08-04 08:20:42 -03:00
Vhariik 5ca48a09b2 Update layeniastation.dmm 2023-08-03 00:01:28 -03:00
Vhariik 65fc4bdd8f Update layeniastation.dmm 2023-08-02 23:57:36 -03:00
Vhariik f3a9245008 Update layeniastation.dmm 2023-08-02 23:51:01 -03:00
Vhariik 186cd57c04 Update layeniastation.dmm 2023-08-02 23:47:15 -03:00
Vhariik f464fb0296 bug fixes and tweaks 2023-08-02 23:34:07 -03:00
Vhariik b87f110a4c Update layeniastation.dmm 2023-08-01 08:36:49 -03:00
Vhariik 7eb68c710b Merge remote-tracking branch 'upstream/master' into Layenia 2023-07-29 23:47:38 -03:00
Vhariik 4d45b1663a Update layeniastation.dmm 2023-07-29 23:47:30 -03:00
BongaTheProto 1b725650cc Merge branch 'pr/906' 2023-07-23 13:37:36 -05:00
Vhariik 91af1dbd04 Update layeniastation.dmm 2023-07-19 23:09:13 -03:00
BongaTheProto 9cb0516138 Merge branch 'pr/857' 2023-07-18 13:05:47 -05:00
Vhariik 356fb45be4 Tiles and decal fixes 2023-07-16 13:01:33 -03:00
Vhariik e6e66b0b41 Update layeniastation.dmm 2023-07-15 13:18:57 -03:00
Vhariik 6fdbb24b3b Merge remote-tracking branch 'upstream/master' into Layenia 2023-07-09 20:56:01 -03:00
Vhariik dc4b51dd57 apparently i forgot ONE railing, now THAT should be all rails fixed B) 2023-07-09 20:55:53 -03:00
BongaTheProto 78a21644ac Merge branch 'pr/874' 2023-07-08 14:43:38 -05:00
Vhariik e889a4a682 fixes and tweaks 2023-07-04 22:30:27 -03:00
Vhariik 5ea5228ed5 Update layeniastation.dmm 2023-07-04 16:57:27 -03:00
Vhariik df36406803 probably the last update regarding rails 2023-07-04 16:16:43 -03:00
Vhariik 4c4cc2dd7a Update layeniastation.dmm 2023-07-04 16:04:01 -03:00
Vhariik 1897c3af62 Update layeniastation.dmm 2023-07-04 16:00:21 -03:00
Vhariik 7fd2aa8576 Update layeniastation.dmm 2023-07-04 15:55:24 -03:00
Vhariik 541056b0de Update layeniastation.dmm 2023-07-04 15:52:03 -03:00
Vhariik 7a1d83f578 fixes and tweaks 2023-07-04 15:50:29 -03:00
Vhariik 771deda882 Update layeniastation.dmm 2023-07-04 00:56:08 -03:00
Vhariik fcd6a29df6 More signs
istg if you can't find dorms NOW...
2023-07-03 21:11:59 -03:00
Vhariik cb654f5ed6 Update layeniastation.dmm 2023-07-03 16:53:54 -03:00
Vhariik c5714084b3 Update layeniastation.dmm 2023-07-02 21:13:33 -07:00
Vhariik fb062136e4 updated space law now spawns, added missing apc 2023-06-28 08:38:40 -03:00
Vhariik 5c9c30169f added the station's pets to their places and fixes gayteway 2023-06-27 11:15:14 -03:00
Vhariik 456591991e Update layeniastation.dmm 2023-06-26 18:33:28 -03:00
Vhariik 414c0fe1c4 Update layeniastation.dmm 2023-06-26 18:28:55 -03:00