Commit Graph

136 Commits

Author SHA1 Message Date
MrSky12
da87e88321 Gatofication 2 2022-06-03 00:07:56 +02:00
SomeGuyEatingPie
ab52d16f29 Copied changes to easily merge 2022-02-15 17:38:47 +00:00
SomeGuyEatingPie
4180d7f5fa Update biogenerator_designs.dm 2021-11-23 13:11:51 +00:00
SomeGuyEatingPie
69b98b289e Update biogenerator_designs.dm 2021-11-23 13:11:14 +00:00
SomeGuyEatingPie
82c835fbe2 Added flour and I did it all myself :)
coppied the entry for milk, changed 'milk' to 'flour' and upped the ammout produced to 15u (flour is not very nutritious) (also 15u is used for all recipies).
I hope I did this right.
2021-11-23 12:58:46 +00:00
Dahlular
82bdbfa72d Lightly slaps xenobio 2021-10-12 03:18:28 -06:00
Dahlular
15150c056a Temporarily Removes Drones, replacing later 2021-09-24 16:43:26 -06:00
QuoteFox
f914df3bc4 Merge pull request #1364 from Azarak/uuuuhhhh
Ports Long Range Gas Analyzer
2021-07-20 02:44:29 +01:00
QuoteFox
3a290ebd04 Merge pull request #1361 from EldritchBaguette/test
Fixes "medkit cabinent" typo
2021-07-20 02:43:35 +01:00
Azarak
fe39ee1533 Ranged analyser 2021-07-19 14:34:37 +02:00
Dimitri Bradley
52faecc81a Fixes "medkit cabinent" typo 2021-07-17 00:33:29 -05:00
Archie
c26d02207a Merge remote-tracking branch 'upstream/master' into fuck512 2021-06-28 03:32:04 -03:00
kevinz000
cf0105de4a Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]" 2021-06-27 14:03:06 -03:00
Archie
730e4d87a4 Fixes cybernetic stomachs 2021-06-26 17:21:01 -03:00
kevinz000
470cb0a588 Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
2021-06-25 21:06:34 -03:00
Archie
78aacdefb4 Utility! 2021-06-19 23:29:20 -03:00
QuoteFox
2af71745eb Merge pull request #1230 from ArchieBeepBoop/nanites
[Ready] Nanite Updates + Nanite TGUI Next
2021-06-19 13:00:53 +01:00
Elli-Skala
b648ef4c7a Update strange_rock.dm 2021-06-17 00:04:19 -04:00
Ghom
a83427d394 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
2021-06-04 15:03:31 -03:00
kevinz000
89a56e8f35 Merge pull request #10569 from keronshb/RemoteMoodResearch
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
2021-06-04 14:39:09 -03:00
kevinz000
dd45aece5b Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
2021-06-04 14:17:33 -03:00
Ghom
629b5975ca Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123
nanites can no longer spread through atmospherics-blocking objects
2021-06-04 14:17:03 -03:00
Archie
737685ca7f Cybernetic stomachs 2021-06-03 03:48:02 -03:00
Archie
7fed066d30 Design fix 2021-05-23 19:36:39 -03:00
Archie
a81c46d52b We do not use the mat rework yet. 2021-05-23 18:48:38 -03:00
Archie
c58fd2bfb6 a 2021-05-23 18:46:45 -03:00
Archie
e3f0f32618 whoops, line ending. 2021-05-23 18:45:43 -03:00
silicons
45b2014369 Ports bluespace pipes from yogs 2021-05-23 18:42:40 -03:00
Chloe Carver-Brown
8872b20c42 Woah! 2021-05-20 10:34:18 +01:00
QuoteFox
b6b71a5b0f H.O.N.K mech, admin spawn only. 2021-04-27 00:40:38 +01:00
DragonTrance
b0acab2ad8 typo 2021-04-22 00:05:03 -07:00
DragonTrance
2de635f4dd can now click stuff while in slime consoles 2021-04-21 23:48:15 -07:00
QuoteFox
1cb1ae10e2 bug fixes, speed potion and layering 2021-04-19 20:03:41 +01:00
DragonTrance
4b931c5e92 mob_biotypes are now flags instead of lists 2021-03-03 11:08:36 -07:00
DragonTrance
6902cf1c79 species that cant get hungry now cant get thorsty 2021-03-01 19:56:05 -07:00
DragonTrance
3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance
c729c61765 added tons of botany changes from citadel (not instability) 2021-02-21 09:57:29 -07:00
DragonTrance
e00a0700b1 #3 2021-02-10 15:35:26 -07:00
DragonTrance
187471f0af #1 2021-02-08 19:15:44 -07:00
Chemlight
1f8af98389 Plants and reagents
Fixed Pink peppers and milkmelon reagents, along with all special xenobotany plants from xenoarch.
2021-01-27 00:49:15 -08:00
QuoteFox
0150066d67 Merge pull request #906 from ArchieBeepBoop/sleepers
Removes VR sleepers from pubby + disables crafting VR sleeper boards.
2021-01-19 23:40:26 +00:00
QuoteFox
5c09c6df37 Merge pull request #903 from MalricB/punishesarchie
Entering upon horseback into the desert community known as "Agua Fria" located in the southwestern U.S. state known as New Mexico, a territory formerly under the jurisdiction of Spanish colonizers in 1598, was a man whose name, origin, motivations, and goals were unknown to every member of said desert community, on a particular day classified as "fine," indicating favorable weather conditions.
2021-01-19 23:39:54 +00:00
Archie
25a467633b Removes VR sleepers from pubby + disables crafting VR sleeper boards. 2021-01-19 18:31:25 -03:00
Archie
ec3a68dc7a Runtime man bad 2021-01-19 18:09:23 -03:00
CygnusB
9ba7d398f6 Revert "Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie""
This reverts commit 8cda8bbd16.
2021-01-19 17:48:12 -03:00
CygnusB
17d7425417 MWS Microbatteries into techweb / sec techfab 2021-01-19 17:46:34 -03:00
CygnusB
8cda8bbd16 Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie"
This reverts commit 1945c166b4, reversing
changes made to c8d20ea83c.
2021-01-19 06:40:28 -03:00
Archie
41540397db Fixes a bunch of fallout 2021-01-16 16:12:38 -03:00
QuoteFox
9c1abdd9b4 Merge pull request #871 from Grant4455/master
Research fix for arcade machines and the Autoylathe
2021-01-15 20:36:18 +00:00
QuoteFox
83567cf685 Ports techweb backend refactor & co.
from https://github.com/Citadel-Station-13/Citadel-Station-13/pull/9737
2021-01-15 18:28:36 +00:00