cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-14 20:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,326 Commits 55 Branches 0 Tags
1a90c96e4b82b56a3b3917f19bcb514580f49b04
Commit Graph

60 Commits

Author SHA1 Message Date
silicons
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
Putnam
6ae984971c Ported bluespace pipes from yogs 2021-03-30 23:25:36 -07:00
DeltaFire
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
silicons
8c97297a47 Merge pull request #14444 from DeltaFire15/jar-removal 
Locks Bluespace Jars to be admin-only
 2021-03-18 06:41:38 -06:00
DeltaFire
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
YakumoChen
cb96d72cbd Update medical_nodes.dm 2021-03-13 02:54:19 +00:00
YakumoChen
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
silicons
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
silicons
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
SiliconMain
bc64cedc2d Update misc_nodes.dm 2021-01-12 14:42:35 -06:00
silicons
b0a94a6e1c Update engineering_nodes.dm 2021-01-09 07:30:14 -07: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
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