SiliconMain
bc64cedc2d
Update misc_nodes.dm
2021-01-12 14:42:35 -06:00
silicons
ccbfd4015e
Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon
...
Ports bluespace navigation gigabeacon from TG
2021-01-03 18:11:10 -07:00
silicons
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
DeltaFire
2ed866d855
boom
2021-01-01 07:22:10 +01:00
Chiirno
218cac1a49
OK, chem mixer has been added to a tech node now.
2020-12-31 22:19:51 -04:00
shellspeed1
45ce0a72a1
Ports bluespace navigation gigabeaconon
...
port of https://github.com/tgstation/tgstation/pull/44807
2020-12-31 01:49:38 -08:00
Lin
3ad777f8f7
Merge pull request #13755 from silicons/colormates
...
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
silicons
317f33b4e5
fixes
2020-12-11 05:14:23 -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
0d8bea1c9b
QoL: Adds BSB's to Service, adds R.Plunger design
2020-10-08 23:27:17 -04: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
f977ac7180
e e e ee ee
2020-08-11 17:08:21 +10:00
lolman360
308d77da7c
Merge branch 'master' into plumb
2020-08-09 22:48:18 +10:00
SiliconMain
abdafe15fa
fuck
2020-07-26 15:21:24 -05: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
Timothy Teakettle
15e137dd18
Merge branch 'master' into tray-and-jar
2020-07-01 22:06:17 +01:00
timothyteakettle
10a0e1b688
stick it on the right node
2020-06-30 00:46:27 +01:00
timothyteakettle
2e4c5e322d
tray and jar
2020-06-29 02:49:31 +01:00
kappa-sama
5787a75dee
node
2020-06-27 18:20:13 -04:00
kappa-sama
61caf7dde2
spraycan
2020-06-27 18:15:20 -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
silicons
8b04fd70de
Merge pull request #12615 from Ghommie/Ghommie-cit821
...
Solving several issues.
2020-06-27 14:52:59 -07:00
Ghommie
8f6b31c26e
Solving several issues.
2020-06-26 18:40:20 +02: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
silicons
99a7c49e52
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
...
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
Detective Google
ab05e48149
adds the medical gygax
2020-06-20 16:22:28 -05:00
shellspeed1
b490f02c78
Ports IV bags from TG
...
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
2020-06-18 02:30:58 -07:00
SmArtKar
17c38efbb0
Runtime Fixes
2020-06-18 11:24:08 +03:00
Timothy Teakettle
2229db2214
Merge branch 'master' into embed-changes
2020-06-17 16:40:34 +01:00
SmArtKar
46c3e9e54d
Shuttles
2020-06-16 18:16:14 +03:00
timothyteakettle
e010212180
please work
2020-06-15 23:49:38 +01:00
Timothy Teakettle
8ec5672b85
tonne of fixes
2020-06-10 21:14:08 +01:00
Timothy Teakettle
95b8cd3956
first port
2020-06-10 20:33:01 +01:00
shellspeed1
e80ec920e0
Moved the tanks to industrial tech node.
2020-06-04 16:42:10 -07:00
shellspeed1
2002a273de
Makes empty internal tanks printable
2020-06-04 16:04:16 -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
Ghommie
7fb96ab0cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-05-12 20:06:59 +02:00
Ghommie
2b429a93d2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit737
2020-05-10 06:30:41 +02:00
Ghommie
015660c806
Trilby's grammar is a F-
2020-05-10 06:21:29 +02:00
Ghommie
c4c4285b00
Reorganizing techweb nodes in a subfolder.
2020-05-10 06:20:04 +02:00
Hatterhat
6067370a6f
shotgun shell clips ( #11955 )
...
* shell clips revised by based ghom
* lmao yeet better not forget that bit
* nitpicking but also merge 11976 first
* No freeloaders.
* Update weapon_designs.dm
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-09 02:49:25 +02: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
DeltaFire
1a6f5eb131
If it compiles it works
...
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
