Commit Graph
426 Commits
Author SHA1 Message Date
Hatterhat f1d5db7983 lol. lmao 2021-10-16 05:02:04 -05:00
Putnam3145 dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
SandPoot e7d5275a70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-20 14:32:29 -03:00
siliconsandGitHub 2bf73138fa Merge pull request #15157 from DeltaFire15/nanite-storage
Storage nanite designs are no longer inaccessible
2021-09-19 11:07:13 -07:00
SandPoot 1982c3962f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-18 22:03:30 -03:00
DeltaFire 146682d1ee adds storage protocols to bepis 2021-09-16 03:41:49 +02:00
DeltaFire a4d71fcfa4 -debug comment 2021-09-16 03:18:52 +02:00
DeltaFire b02825c679 uh oh 2021-09-16 03:14:24 +02:00
SandPoot e738c3cf21 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-27 12:40:48 -03:00
WanderingFox95andGitHub 6c111d89c5 It's back in bottling research, also renamed. 2021-08-17 21:35:30 +02:00
WanderingFox95andGitHub c1f173d8e6 Decided against locking them behind research 2021-08-17 15:10:33 +02:00
WanderingFox95andGitHub 631f8dfda5 Clarifies that there are now blank bottles in the research node too. 2021-08-17 14:52:09 +02:00
WanderingFox95andGitHub 56246d9b56 Adds the bottles to the bottling research tech 2021-08-17 14:28:55 +02:00
SandPoot dbf3b3f057 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-28 14:22:48 -03:00
Putnam3145 cbdcf4dfa5 we don't have tinker_nanites 2021-07-25 20:04:57 -07:00
SandPootandGitHub 793435218b Alien parts modularized (#171) 2021-07-05 19:10:22 -03:00
SandPoot 3c7a878c8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-24 21:58:46 -03:00
6144e67208 Adds syringes, pillbottles, hyposprays to medical protolathe (#14662)
* adds pillbottles, syringes, Hyposprays to autolathe

* Adds syringes, pillbottles, and hyposprays to starting techweb

* cuts hyposprays from autolathe

* Makes Hyposprays not shiftstart tech

* Hypospray added to advanced biotech node

* Update code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* removing hyposprays from autolathe designs

* Adds hyposprays to medical designs

* corrects issues with hypospray implementation

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-06-24 20:25:18 +02:00
SandPoot 32bfbe1604 factory_nanites don't exist 2021-06-19 10:27:07 -03:00
SandPoot 13e0116894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-29 11:09:28 -03:00
siliconsandGitHub e3755fba92 Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
Ports a significant amount of the tg cybernetic organ code + more
2021-04-28 21:20:57 -06:00
The0bserver c7b231637e boxes of ammo, also fire not weapon is bullet 2021-04-24 00:53:57 -04:00
necromanceranne 0f04bbb23b Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power 2021-04-22 13:06:31 +10:00
SandPoot d186ccfef7 upload files 2021-04-19 00:56:49 -03:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
Putnam 6ae984971c Ported bluespace pipes from yogs 2021-03-30 23:25:36 -07:00
SandPoot afae5c3247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-23 19:49:58 -03:00
DeltaFireandGitHub afd8af60e3 Merge pull request #14430 from YakumoChen/genetics
Adjusts Thermals in Genetics; Moves X-ray implant to illegal tech.
2021-03-23 22:35:54 +01:00
SandPoot a8076257a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-18 22:56:09 -03:00
siliconsandGitHub 8c97297a47 Merge pull request #14444 from DeltaFire15/jar-removal
Locks Bluespace Jars to be admin-only
2021-03-18 06:41:38 -06:00
DeltaFireandGitHub 45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
2021-03-17 17:01:47 +01:00
DeltaFire f99c17012c removes jars from techweb 2021-03-15 22:26:05 +01:00
SandPoot ad22129f75 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-13 22:53:31 -03:00
YakumoChenandGitHub cb96d72cbd Update medical_nodes.dm 2021-03-13 02:54:19 +00:00
YakumoChenandGitHub 72939a9b97 Update syndicate_nodes.dm 2021-03-13 02:53:48 +00:00
Hatterhat d3a6c9b20a removes bshv 2021-03-11 23:38:49 -06:00
Hatterhat 8bebe5a649 adds hypokit 2021-03-10 16:17:24 -06:00
Hatterhat d473b271cb uh oh! it's another stupid fucking hatter pr! 2021-03-10 15:06:39 -06:00
Hatterhat 80469a32f9 WHY WON'T YOU HIDE CORRECTLY 2021-03-01 22:33:21 -06:00
SandPoot e7e655112d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-14 20:21:02 -03:00
siliconsandGitHub 28849dd8e9 Merge pull request #14039 from Hatterhat/sticky-start
on the precipice of stickiness - sticky tape roundstart tech
2021-01-13 21:02:23 -07:00
SandPoot e10c783cf0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-13 20:59:40 -03:00
siliconsandGitHub bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
2021-01-13 16:53:01 -07:00
Hatterhat b36a1142fe on the precipice of stickiness 2021-01-12 16:58:20 -06:00
SiliconMainandGitHub bc64cedc2d Update misc_nodes.dm 2021-01-12 14:42:35 -06:00
SandPoot 6445be2f35 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-12 08:00:12 -03:00
siliconsandGitHub b0a94a6e1c Update engineering_nodes.dm 2021-01-09 07:30:14 -07:00
SandPoot 168799038d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-04 02:05:26 -03:00
siliconsandGitHub ccbfd4015e Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon
Ports bluespace navigation gigabeacon from TG
2021-01-03 18:11:10 -07:00
siliconsandGitHub 2641332fb2 Merge pull request #13941 from Chiirno/ChemMixerHotfix
Portable Chem Mixer now added to the Biological Technology tech node.
2021-01-03 18:09:50 -07:00