 SandPoot
|
6809afb45c
|
Many borg changes (seriously) (#69)
|
2020-09-15 23:25:59 -03:00 |
|
|
Enric Gabriel
|
d286153128
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-04 19:08:14 -03:00 |
|
|
raspy-on-osu
|
9b56991f77
|
init
|
2020-09-02 17:54:35 -04:00 |
|
|
Enric Gabriel
|
c10471fac9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:29 -03: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 |
|
|
Enric Gabriel
|
b0662f5e39
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-21 02:19:20 -03: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 |
|
|
Enric Gabriel
|
12c21496b6
|
Some useful stuff (#34)
|
2020-07-29 22:13:57 -03:00 |
|
|
Enric Gabriel
|
c0e884b3a9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-07-29 20:25:36 -03:00 |
|
|
Timothy Teakettle
|
9a9993c7be
|
yep
|
2020-07-29 19:00:06 +01:00 |
|
|
Enric Gabriel
|
bcda6cb6a6
|
fixes some stuff. **NOT DMM ON SPACE MAN THOUGH**
|
2020-07-29 11:04:22 -03:00 |
|
|
Enric Gabriel
|
935901593b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-07-29 09:52:32 -03: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 |
|
|
Enric Gabriel
|
e0fdf3dce9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts
|
2020-07-23 19:14:58 -03:00 |
|
|
Enric Gabriel
|
309803771b
|
T5 parts (#28)
* :D
* Update chem_dispenser.dm
* Update chem_dispenser.dm
* D:
* Update power_designs.dm
Co-authored-by: TrilbySpaceClone <trilbyspaseclone@gmail.com>
Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
|
2020-07-23 19:08:54 -03: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 |
|
|
Detective-Google
|
29ab16c3ed
|
Update mechfabricator_designs.dm
|
2020-06-22 18:27:58 -05:00 |
|
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
|
silicons
|
99a7c49e52
|
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
Ports IV bags from TG
|
2020-06-21 14:11:10 -07:00 |
|
|
shellspeed1
|
06f0d42ee9
|
makes chem packs slightly cheaper
|
2020-06-20 16:53:39 -07:00 |
|
|
Detective Google
|
ab05e48149
|
adds the medical gygax
|
2020-06-20 16:22:28 -05:00 |
|
|
Ghommie
|
43acf79dd3
|
oh wow
|
2020-06-19 21:55:01 +02:00 |
|
|
Ghommie
|
162549a3c2
|
Fixing stuff.
|
2020-06-19 20:34:51 +02:00 |
|
|
kevinz000
|
1b5ea90c8f
|
sigh
|
2020-06-18 08:16:05 -07:00 |
|