7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
4ba7f2ac0a
add paint kit to research
2023-05-01 00:22:37 -05:00
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
072087ec14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-15 20:22:44 -03:00
44913d5fff
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter
2023-01-28 01:20:26 -03:00
c60f36a42b
files
2023-01-28 01:10:49 -03:00
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
35497b250f
Merge pull request #15914 from Hatterhat/conveyor-sorter
...
[good to go] conveyor sorters, conveyor switch tool interacts, also makes mechs not explode on sale
2023-01-07 14:09:55 -08:00
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
6a2216e101
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-02 19:05:23 -03:00
1401959cc9
Merge pull request #15911 from Hatterhat/prescription
...
prescription kits, aka the eyewear accessibility update
2023-01-01 22:52:21 -07:00
34eaf93a01
sorters! one-way setting! brazen code borrowing!
2022-12-29 20:18:34 -06:00
d337852c68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-28 16:56:04 -03:00
ab827ff8dc
accessibility or some shit ig
2022-12-26 03:45:26 -06:00
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
d3c72669d9
clean up & remove longfall boots
2022-12-20 02:03:45 -07:00
c32cac89d6
fix jetpack placement on techweb
2022-12-17 16:54:35 -07:00
642d24e8e1
tether module
2022-12-17 16:54:20 -07:00
483fe09260
add jetpacks to techweb
2022-12-17 16:54:12 -07:00
ec78e51760
remove piercing injector, doesn't work properly
2022-12-13 19:15:19 -07:00
94bfa88ed9
add more platings
2022-12-13 19:14:43 -07:00
f7ac3c7624
beeg commit
2022-12-11 20:32:35 -07:00
5384cb9d4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-12 22:25:25 -03:00
b4f886d999
port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic
2022-09-18 20:55:22 -07:00
3dace329be
adds public bounty consoles without inflation, also removes the mint
2022-09-17 19:27:40 -07:00
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03:00
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
07a4c5c12b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-11 04:54:12 -03:00
6fe08f0a4e
Rebalancing QCD a bit
2022-06-06 20:41:10 -07:00
5c5bb3c5c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-12 18:09:56 -03:00
95416bbedc
Merge pull request #15587 from TomGarou/Synth-Brainwashing
...
Synth Brainwashing AKA Reprogramming
2022-05-12 20:29:04 +00:00
41949a8be1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-29 13:24:42 -03:00
13f326c939
Merge branch 'master' into Synth-Brainwashing
2022-04-15 17:44:30 -07:00
5d4bae4482
Update files
2022-04-10 23:27:12 -03:00
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
59874f6553
Synth Brainwashing
...
Adds synthetic brainwashing to Citadel-Station-13
2022-04-08 01:26:07 -04:00
aec888a7b6
Update files
2022-03-16 15:17:57 -03:00
3a03ee6475
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-23 16:15:11 -03:00
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
bb7d894944
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-15 17:33:44 -03:00
13834847e0
it works better when you're actually using a delta
2021-12-11 17:04:05 -08:00
6367adf154
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-18 15:51:53 -03:00
026ce5dec4
tiny bit more polish, some number tweaks, and research.
2021-10-31 04:18:15 -07:00
e5badd2e09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 13:31:55 -03:00
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
f1d5db7983
lol. lmao
2021-10-16 05:02:04 -05:00
dc22e02a1b
Removes minesweeper
2021-10-01 23:08:08 -07:00
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03:00
SandPoot