shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,252 Commits 5 Branches 0 Tags
ac4bb92cec7475e705b8dbcb0c46d8aafd6e563b
Commit Graph

610 Commits

Author SHA1 Message Date
silicons 679189cb3d Merge pull request #15277 from Hatterhat/autoloom 
i've been sitting on this a while but here have the AUTOLOOM
 2021-10-27 05:13:40 -07:00
Hatterhat 9c45c41d4f ae 2021-10-16 18:27:59 -05:00
Hatterhat f1d5db7983 lol. lmao 2021-10-16 05:02:04 -05:00
Putnam3145 dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
qweq12yt 4e8b02dd75 restored the serving tray to the autholathes 2021-09-27 17:38:28 -03:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
WanderingFox95 dc5c107adc Bottles for the service lathe (Equipment) 2021-08-17 14:27:50 +02:00
Eric 6144e67208 Adds syringes, pillbottles, hyposprays to medical protolathe (#14662) 
* adds pillbottles, syringes, Hyposprays to autolathe

* Adds syringes, pillbottles, and hyposprays to starting techweb

* cuts hyposprays from autolathe

* Makes Hyposprays not shiftstart tech

* Hypospray added to advanced biotech node

* Update code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* removing hyposprays from autolathe designs

* Adds hyposprays to medical designs

* corrects issues with hypospray implementation

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-06-24 20:25:18 +02:00
Artur f33343c6db https://github.com/tgstation/tgstation/pull/56739 2021-06-16 01:17:13 +03:00
Artur 724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
WanderingFox95 499111edf8 Efink 2021-05-17 12:33:39 +02: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
silicons b6b62e84bc Update machine_designs_service.dm 2021-03-28 12:47:22 -07:00
silicons bf382f490c Merge pull request #14518 from necromanceranne/shield_explodies_fix 
Shields: Changes, additional flags, bug fixes, sprites
 2021-03-27 01:31:55 -06:00
necromanceranne 79de55c58c First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately. 2021-03-25 09:07:52 +11:00
Lin 51b955d47e Merge pull request #14460 from Hatterhat/exp-sup-con 
moves the express supply console and upgrade disk to appropriate tabs
 2021-03-19 19:18:19 -05: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
Hatterhat 5fa06109ac lemme get uh 2021-03-17 15:49:57 -05: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
Hatterhat 97e0e01265 ok 2021-03-17 03:25:06 -05:00
DeltaFire f99c17012c removes jars from techweb 2021-03-15 22:26:05 +01:00
silicons 5a9fc99aba Merge pull request #14310 from Hatterhat/robo-surgery 
[READY] robo-limb surgery tiers
 2021-03-12 19:40:02 -07: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
Hatterhat 1fc94c0441 uuuuuuuuuuuuh 2021-02-27 23:17:09 -06:00
Letter N 45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
silicons a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513 
[READY] somatoray buff - mutation locks + revolution ray
 2021-01-25 23:17:29 -07:00
Hatterhat a8cb8b79c6 for one, dont forget the sprites, dumbass 2021-01-19 17:40:34 -06:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
The0bserver 1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
silicons ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone 
Comments out hololocks
 2021-01-13 16:53:01 -07:00
Hatterhat cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
SiliconMain a26590965e Update misc_designs.dm 2021-01-12 14:41:10 -06:00
Lin 95101ac36a Merge pull request #14013 from Citadel-Station-13/compressor 
lets science actually print explosive compressors
 2021-01-11 00:21:11 +00:00
silicons c36151b4cf Update machine_designs_sci.dm 2021-01-09 15:35:26 -07:00
silicons 34c5d99afb Update machine_designs_sci.dm 2021-01-09 07:29:31 -07:00
shellspeed1 04d60c85d9 a 2021-01-09 03:06:48 -08: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
DeltaFire 2ed866d855 boom 2021-01-01 07:22:10 +01: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
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