Commit Graph

569 Commits

Author SHA1 Message Date
DeltaFire
2ed866d855 boom 2021-01-01 07:22:10 +01:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
SandPoot
a0ae0c37fe upload files 2020-12-16 11:39:50 -03:00
silicons
317f33b4e5 fixes 2020-12-11 05:14:23 -07:00
silicons
18bdda1273 fix 2020-11-22 15:01:19 -07:00
silicons
5ae410790b locking 2020-11-22 14:40:57 -07:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
DeltaFire
410ffffcc3 there we go
robot rad safe: 250, 750 with upgrade (500 for normal mobs)

Also some typo fixes
2020-11-15 20:30:50 +01:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
The0bserver
0d1d94fd06 belt 2020-10-09 01:17:46 -04:00
The0bserver
0d8bea1c9b QoL: Adds BSB's to Service, adds R.Plunger design 2020-10-08 23:27:17 -04:00
silicons
1f82e8985c Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
The0bserver
e0089ea813 Again? 2020-10-01 06:44:11 -04:00
The0bserver
48df6a9494 I shot the tray, I made an accurate tip. 2020-10-01 04:07:16 -04:00
silicons
9fc169a3ae Merge pull request #13432 from SiliconMain/patch-6
Tweaks a thing
2020-09-27 00:33:14 -07:00
SiliconMain
4e5296438c Update tool_designs.dm 2020-09-25 09:46:11 -05:00
Neko Boi Nick
6c8988c89c Light replacer can print at Engineering 2020-09-22 10:42:56 -07:00
raspy-on-osu
9b56991f77 init 2020-09-02 17:54:35 -04:00
The0bserver
6b3a0c3531 A few changes, new fertilizer obtainable now. 2020-09-02 01:00:49 -04:00
silicons
9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer
Portable chem mixer
2020-08-29 21:34:57 -07:00
Chiirno
fdc2cea077 added chem dispenser, time for errors 2020-08-27 14:27:35 -03:00
Letter N
b8d812fb47 "what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50 2020-08-23 17:18:32 +08:00
lolman360
f2a86f2c42 Update medical_designs.dm 2020-08-18 14:23:09 +10:00
lolman360
8356dbf20a Update medical_designs.dm 2020-08-18 13:26:32 +10:00
lolman360
32c0335a17 Update medical_designs.dm 2020-08-18 10:35:56 +10:00
lolman360
f977ac7180 e e e ee ee 2020-08-11 17:08:21 +10:00
lolman360
6c57dce54e WX 2020-08-09 23:52:21 +10:00
lolman360
fee304fb19 Update medical_designs.dm 2020-08-09 22:55:10 +10:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
Timothy Teakettle
9a9993c7be yep 2020-07-29 19:00:06 +01:00
SiliconMain
63bb9fe0f3 the dangers of copypaste 2020-07-26 16:35:50 -05:00
SiliconMain
abdafe15fa fuck 2020-07-26 15:21:24 -05:00
lolman360
17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
lolman360
c07e5d544b wweeee 2020-07-22 11:27:26 +10:00
lolman360
0f1aa3c0ca 'lolman? did you test your code?'
no i did not ms. kevinz
2020-07-22 10:49:56 +10:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
silicons
6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
2020-07-08 03:10:44 -07:00
Timothy Teakettle
15e137dd18 Merge branch 'master' into tray-and-jar 2020-07-01 22:06:17 +01:00
kappa-sama
cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama
1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00
YakumoChen
8e25b90d54 removes obselete part 2020-07-01 09:08:01 +00:00
YakumoChen
327a36f8bd removes obselete autolathe designs 2020-07-01 09:06:29 +00:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
timothyteakettle
2e4c5e322d tray and jar 2020-06-29 02:49:31 +01:00
kappa-sama
d98175d947 decal painter to lathe 2020-06-27 18:19:49 -04:00
kappa-sama
579727d41d spraycans 2020-06-27 18:14:20 -04:00
kappa-sama
a96bd52c91 airlock painting 2020-06-27 18:13:09 -04:00
silicons
45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
2020-06-27 14:53:28 -07:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
silicons
3cad6221ca Merge pull request #12571 from Detective-Google/medigygax
Adds the medical-spec gygax
2020-06-24 08:43:30 -07:00