Commit Graph

647 Commits

Author SHA1 Message Date
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
silicons
23327fa268 Merge pull request #15894 from JerryWester/modsuits
MODsuits
2023-01-07 14:07:28 -08:00
Lin
1401959cc9 Merge pull request #15911 from Hatterhat/prescription
prescription kits, aka the eyewear accessibility update
2023-01-01 22:52:21 -07:00
Hatterhat
ab827ff8dc accessibility or some shit ig 2022-12-26 03:45:26 -06:00
Darius
d3e018720c Port the Bluespace Light Replacer
- Ports the Bluespace Light Replacer from TG
-- Added to Applied Bluespace Research instead of Advanced Sanitation Technology
- Makes the basic Light Replacer a default tech node
2022-12-24 15:57:11 -05:00
Jerry Wester
f083852b6f all modules available from mechfab 2022-12-20 02:03:57 -07:00
Jerry Wester
d3c72669d9 clean up & remove longfall boots 2022-12-20 02:03:45 -07:00
Jerry Wester
642d24e8e1 tether module 2022-12-17 16:54:20 -07:00
Jerry Wester
483fe09260 add jetpacks to techweb 2022-12-17 16:54:12 -07:00
Jerry Wester
ec78e51760 remove piercing injector, doesn't work properly 2022-12-13 19:15:19 -07:00
Jerry Wester
94bfa88ed9 add more platings 2022-12-13 19:14:43 -07:00
Jerry Wester
f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
silicons
f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties
Port of public bounties and the sales tagger from tg.
2022-10-12 03:27:37 -07:00
silicons
fbf7a2de90 Merge pull request #15853 from shellspeed1/posialert-console
Port of the Posialert console from hyper. Credit to jjpark-kb for initial work.
2022-09-23 16:21:19 -07:00
shellspeed1
cdb1fbb1e2 port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic. 2022-09-18 21:55:10 -07:00
shellspeed1
b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
shellspeed1
3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
shellspeed1
d83747dc74 Ports Quantum Spin Inverter from TG. (#15846)
* ports bluespace swapper

* fixes materials so we can print quantum spin inverters

* its diamond not diamoond
2022-09-17 13:39:32 -07:00
shellspeed1
527b85e4a4 woopsie 2022-09-17 02:00:47 -07:00
shellspeed1
59ef5bbcf1 port of the positronic alert console 2022-09-17 01:55:55 -07:00
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