Commit Graph

147 Commits

Author SHA1 Message Date
silicons
ce7d7a5124 Merge pull request #15594 from SandPoot/stasis-beds-update
Makes stasis beds *slightly* less hated
2022-04-27 16:11:34 -07:00
SandPoot
5d4bae4482 Update files 2022-04-10 23:27:12 -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
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Artur
3824daba05 Trailing newlines 2022-04-06 16:10:57 +03:00
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
silicons
679189cb3d Merge pull request #15277 from Hatterhat/autoloom
i've been sitting on this a while but here have the AUTOLOOM
2021-10-27 05:13:40 -07:00
Hatterhat
7e7a5af53a brought to you by neilcic - Floor Corn 2021-10-16 05:00:15 -05: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
Putnam3145
dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
LetterN
760a7de229 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-22 09:32:21 +08:00
LetterN
150f6f4328 cbt 2021-03-19 20:11:26 +08:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
GrayRachnid
b4969c4770 Fixes auto-calling for non-heads and adds secure holopads 2021-03-17 12:40:25 -04:00
Letter N
e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
Letter N
34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N
6286d40082 code works 2021-02-12 17:26:08 +08:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Letter N
0b088be4df missing , 2021-01-17 18:00:43 +08:00
Letter N
919b8c8d57 Update machine_circuitboards.dm 2021-01-17 17:54:06 +08:00
silicons
c70d7a24e0 fixes 2020-12-11 05:14:38 -07:00
silicons
13391d2af6 fix 2020-12-11 05:09:29 -07:00
The0bserver
6d1ace27f7 Initial Commit: Mapping is painful 2020-11-18 00:38:35 -05:00
BlackMajor
1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
2020-09-06 17:53:35 +12:00
raspy-on-osu
4c8983f006 init 2020-09-04 22:13:56 -04:00
silicons
b2a38a09a1 circuit 2020-08-23 05:59:24 -07:00
lolman360
f977ac7180 e e e ee ee 2020-08-11 17:08:21 +10:00
lolman360
c07e5d544b wweeee 2020-07-22 11:27:26 +10:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
kevinz000
1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
SmArtKar
46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2
Adds a New map, Snow Taxi (A vgstation13 map port)
2020-06-02 23:48:50 +02:00
Ghom
0a6b755eff Apotechary chem dispenser nerf. (#12292)
* Apotechary chem dispenser nerf.

* Spelling and build_path.
2020-05-24 13:20:32 -07:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
2020-05-24 13:05:15 -07:00
Detective Google
6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05:00
Detective Google
424133c48a adds the actual snow taxi to snaxi 2020-05-09 22:20:26 -05:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Ghommie
54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie
0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00