Commit Graph
45434 Commits
Author SHA1 Message Date
LinandGitHub 336a66edd5 Merge pull request #15386 from keronshb/winterball2021
FestiveMap (Winter Ball 2021)
2021-11-27 23:44:51 +00:00
CitadelStationBot f426a114d7 Automatic changelog generation for PR #15396 [ci skip] 2021-11-27 16:50:58 -06:00
LinandGitHub 1711a89efd Merge pull request #15396 from TripleShades/fixies
Various Main Map Tweaks
2021-11-27 22:50:54 +00:00
Linzolle fb3fa9ac17 mores wires :^) 2021-11-26 22:59:02 -07:00
Linzolle f74872970e wiring shenanigans 2021-11-26 22:36:52 -07:00
Linzolle 9756528f63 why are there space tiles here 2021-11-26 22:22:29 -07:00
Linzolle eddf853b74 dumb gas mix var 2021-11-26 21:52:58 -07:00
Linzolle fdf4b88f6b observer runtime 2021-11-26 21:37:00 -07:00
Linzolle 34a7953b2f maybe don't have lavaland atmos on the ball map 2021-11-26 21:29:53 -07:00
Linzolle 8ec47864b7 cool atmos bro 2021-11-26 21:24:55 -07:00
Linzolle 5bd3ab6e61 make sure the streets have power 2021-11-26 21:08:09 -07:00
Linzolle 3084ef1231 areas and power and atmos oh my 2021-11-26 20:50:39 -07:00
Linzolle 776f69e119 turfs go in the turfs file and it is too cold 2021-11-26 19:53:33 -07:00
Linzolle afe81f711b Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball 2021-11-26 18:46:57 -07:00
keronshb 2152e5b749 Critical map fix 2021-11-26 20:40:31 -05:00
CitadelStationBot c957b59f3d Automatic changelog generation for PR #15397 [ci skip] 2021-11-26 18:47:53 -06:00
LinandGitHub 43aa80f9e7 Merge pull request #15397 from SandPoot/lewdcap-
Allows toggling of Captain's female formal outfit's legs
2021-11-26 17:47:50 -07:00
Changelogs f975f960f5 Automatic changelog compile [ci skip] 2021-11-27 00:26:35 +00:00
Changelogs 947e1523f1 Automatic changelog compile [ci skip] 2021-11-26 00:27:32 +00:00
SandPoot 3618248b4e Upload files 2021-11-24 23:11:12 -03:00
TripleShades a92464d0ce a 2021-11-24 20:31:23 -05:00
Changelogs 2546b352a7 Automatic changelog compile [ci skip] 2021-11-25 00:28:22 +00:00
TripleShades 27ab217ab7 a 2021-11-24 16:36:47 -05:00
TripleShades c56eb47692 Update DeltaStation2.dmm 2021-11-24 16:35:02 -05:00
TripleShades bd67872e5d Update DeltaStation2.dmm 2021-11-24 16:26:29 -05:00
TripleShades e5ddf722e7 Update BoxStation.dmm 2021-11-24 16:23:36 -05:00
TripleShades e6d8bae3d0 Update PubbyStation.dmm 2021-11-24 16:20:35 -05:00
TripleShades 1666cbc6fb Update BoxStation.dmm 2021-11-24 16:20:29 -05:00
TripleShades 6f40296734 Update BoxStation.dmm 2021-11-24 16:14:17 -05:00
TripleShades ff19a277a4 Update BoxStation.dmm 2021-11-24 16:13:19 -05:00
TripleShades cc2cb3a5c1 Update BoxStation.dmm 2021-11-24 16:12:19 -05:00
TripleShades aadffe30c6 Update MetaStation.dmm 2021-11-24 16:09:27 -05:00
TripleShades e2caec8aad Update MetaStation.dmm 2021-11-24 16:08:00 -05:00
TripleShades 0f548093bb Update MetaStation.dmm 2021-11-24 16:06:31 -05:00
TripleShades 5bf52a61f3 Update MetaStation.dmm
Meta Solars Light Fixture
2021-11-24 16:04:41 -05:00
TripleShades 74437c1fb7 Update MetaStation.dmm 2021-11-24 16:01:14 -05:00
CitadelStationBot e08cffc176 Automatic changelog generation for PR #15376 [ci skip] 2021-11-24 11:38:12 -06:00
LinandGitHub d5c17f0d84 Merge pull request #15376 from SandPoot/double
Double beds
2021-11-24 17:38:10 +00:00
CitadelStationBot a3fa993acd Automatic changelog generation for PR #14868 [ci skip] 2021-11-24 11:32:51 -06:00
LinandGitHub e3a5391250 Merge pull request #14868 from Arturlang/admin_mapsave
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
Changelogs 18fd26d3fa Automatic changelog compile [ci skip] 2021-11-24 00:27:42 +00:00
CitadelStationBot 6dbdfbfa6c Automatic changelog generation for PR #15392 [ci skip] 2021-11-23 15:55:09 -06:00
LinandGitHub f33af9b35c Merge pull request #15392 from timothyteakettle/fix-oil-drum
oil drum now recognises synthetic anthormorphs as synths
2021-11-23 21:55:07 +00:00
siliconsandGitHub 38f7e07bcc Update living.dm (#15394) 2021-11-23 18:36:51 +01:00
LinandGitHub 7796dcdd40 Merge pull request #15393 from Citadel-Station-13/spacehoodie
Donator - Adds Space Hoodie
2021-11-23 02:36:32 +00:00
LinandGitHub e081ad70b6 Update custom_items.dm 2021-11-23 02:35:32 +00:00
LinandGitHub c6c6827377 Update custom_items.dm 2021-11-23 02:35:01 +00:00
Changelogs 8ba9477755 Automatic changelog compile [ci skip] 2021-11-23 00:27:45 +00:00
CitadelStationBot 7985acdf02 Automatic changelog generation for PR #15389 [ci skip] 2021-11-22 16:02:53 -06:00
LinandGitHub 6d5882fcfd Merge pull request #15389 from TripleShades/pubby
Pubby Paramedical
2021-11-22 22:02:50 +00:00