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
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
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
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
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
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
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
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
silicons
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
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
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
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
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
BongaTheProto
e1cb9c8346
Merge remote-tracking branch 'upstream/master'
2022-09-27 23:19:10 -05:00
SandPoot
f039efca97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-27 01:19:55 -03: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
BongaTheProto
9cdaffc417
Merge remote-tracking branch 'upstream/master'
2022-09-18 23:40:20 -05: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
SandPoot
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03: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
SpookyTheFox
42e424a600
fixed this
...
this has been wrong for so so long
2022-09-12 22:33:29 -07:00
SandPoot
5c5bb3c5c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-12 18:09:56 -03:00
Lin
95416bbedc
Merge pull request #15587 from TomGarou/Synth-Brainwashing
...
Synth Brainwashing AKA Reprogramming
2022-05-12 20:29:04 +00:00
SandPoot
b73b49a8b6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-12 17:18:28 -03: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
SandPoot
41949a8be1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-29 13:24:42 -03:00
