MysteryMan21333
06153ae98f
Xenobiology V1.0
2023-10-14 07:15:46 -05:00
Vhariik
d35affb5de
Shuttle research is now a roundstart tech
2023-08-27 23:55:11 -03:00
Tsurupeta
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
BongaTheProto
5116acad15
Merge remote-tracking branch 'upstream/master'
2023-05-06 18:31:55 -05:00
SandPoot
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
Jerry Wester and KrissKr0ss
4ba7f2ac0a
add paint kit to research
2023-05-01 00:22:37 -05:00
KrissKr0ss
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
BongaTheProto
2151624f10
Merge remote-tracking branch 'upstream/master'
2023-02-22 19:14:08 -05:00
SandPoot and SandPoot
2bdec078d7
Merge pull request #311 from Sandstorm-Station/duct-piping
...
Several duct pipe fixes/qol
2023-02-21 16:44:35 -03:00
SandPoot
e0c8419cdd
deal with duct pipes
2023-02-21 16:09:35 -03:00
BongaTheProto
972df3f711
Merge remote-tracking branch 'upstream/master'
2023-02-16 16:30:59 -05:00
SandPoot
072087ec14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-15 20:22:44 -03:00
SandPoot and GitHub
2bf781580e
Merge branch 'master' into new-decal-painter
2023-02-15 20:06:29 -03:00
BongaTheProto
0cfe8e33eb
Merge remote-tracking branch 'upstream/master'
2023-02-12 21:42:34 -05:00
SandPoot
2b8a20bae2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-12 22:59:51 -03:00
Timothy Teakettle and GitHub
5f6e204866
Merge pull request #15940 from squib-bot/fermichemwork
...
Re-Adding Bounty Consoles
2023-02-11 00:06:37 +00:00
BongaTheProto and GitHub
3ec53fc81a
Merge pull request #706 from KeplerWasTaken/sentientmobshelp
...
Sentient Mobs by Sentience Potions will now receive an indicator
2023-02-06 22:18:41 -05:00
SandPoot
b955bc222b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter
2023-02-06 20:24:35 -03:00
BongaTheProto
7146a5f2eb
Merge remote-tracking branch 'upstream/master'
2023-01-30 17:02:01 -05:00
SandPoot
8ae64b1bd8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-29 19:16:50 -03:00
SandPoot
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
SandPoot
c60f36a42b
files
2023-01-28 01:10:49 -03:00
KeplerWasTaken
2be7035ea3
Sentience Transferring into mobs now adds a heart icon aswell
2023-01-22 14:30:22 +01:00
KeplerWasTaken
1c508eeb30
Sentient mobs will now receive a heart icon to display that they're sentient
2023-01-21 18:50:49 +01:00
Darius
4fc30ce8ae
Protolathe material ejection improvements
...
Updates to the protolathe:
- Added eject buttons for 10x, 20x, and 50x
- Renamed "Eject" to "1x"
- Renamed "All" to "Max Stack"
2023-01-16 00:18:35 -05:00
President of Shit PRS
d063144713
Re-Adding Bounty Consoles
...
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
2023-01-14 02:01:12 +00:00
BongaTheProto
ab9d691f1a
Merge remote-tracking branch 'upstream/master'
2023-01-09 16:59:38 -05:00
SandPoot
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
Jerry Wester and GitHub
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
silicons and GitHub
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
silicons and GitHub
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
BongaTheProto
adba643435
Merge remote-tracking branch 'upstream/master'
2023-01-02 17:41:46 -05:00
SandPoot
6a2216e101
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-02 19:05:23 -03:00
Lin and GitHub
1401959cc9
Merge pull request #15911 from Hatterhat/prescription
...
prescription kits, aka the eyewear accessibility update
2023-01-01 22:52:21 -07:00
BongaTheProto
8034d9fb22
Merge remote-tracking branch 'upstream/master'
2022-12-31 14:31:12 -05:00
Hatterhat
34eaf93a01
sorters! one-way setting! brazen code borrowing!
2022-12-29 20:18:34 -06:00
SandPoot
d337852c68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-28 16:56:04 -03: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
c32cac89d6
fix jetpack placement on techweb
2022-12-17 16:54:35 -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
BongaTheProto
79fa770ab3
Merge remote-tracking branch 'upstream/master'
2022-10-13 11:21:32 -05:00
SandPoot
5384cb9d4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-12 22:25:25 -03:00
MysteryMan21333