shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,883 Commits 5 Branches 0 Tags
5a32c5ec40c2e652aaa1db3c8cc803dfdd611503
Commit Graph

627 Commits

Author SHA1 Message Date
Lin
95416bbedc Merge pull request #15587 from TomGarou/Synth-Brainwashing 
Synth Brainwashing AKA Reprogramming
 2022-05-12 20:29:04 +00:00
Lin
dec7751f95 Merge pull request #15612 from SandPoot/status_displays 
Syncs status displays to tg's version
 2022-05-12 20:11:54 +00:00
SandPoot
90eab441aa Upload files 2022-05-09 18:50:17 -03:00
silicons
13f326c939 Merge branch 'master' into Synth-Brainwashing 2022-04-15 17:44:30 -07:00
SandPoot
5d4bae4482 Update files 2022-04-10 23:27:12 -03:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
TomGarou
59874f6553 Synth Brainwashing 
Adds synthetic brainwashing to Citadel-Station-13
 2022-04-08 01:26:07 -04:00
silicons
c8cab13081 Merge pull request #15565 from SandPoot/custom-statues 
Custom statues and sculpting changes.
 2022-04-06 12:12:24 -07:00
BlueWildrose
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304) 
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-03-30 20:06:00 -07:00
SandPoot
16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Artur
fc6f3cdffc tested and done, seems to work 2022-02-11 16:54:05 +02:00
Artur
345c1616f2 Adds a way to build bodies using the limbgrower 2022-02-10 18:49:24 +02:00
DeltaFire
074fe5b417 a bunch of stuff 
5° min temp adjustment for active cooling
150% max total cooling efficiency as opposed to 100%
passive heating cools instead at >100% efficiency (to -30°C min)
EMPs jam cooling system readouts.
Nanogel is now printable, for a decent price though it needs a bit of diamond.
 2022-01-02 19:44:35 +01:00
shellspeed1
76324ed06a Update code/modules/research/designs/medical_designs.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:49 -08:00
shellspeed1
71a4b7ba00 Update code/modules/research/designs/medical_designs.dm 
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-11-12 15:17:39 -08:00
shellspeed1
026ce5dec4 tiny bit more polish, some number tweaks, and research. 2021-10-31 04:18:15 -07:00
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