a2aa92cbc4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-01-24 02:08:58 -03:00
fbd3438b5e
guess I gotta update the id field too or there's a runtime or smth
2025-01-15 14:32:55 -07:00
ba85afe895
give autolathe rpd a unique id
2025-01-14 20:23:28 -07:00
75d1a7d69c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-26 04:31:35 -03:00
dc08550162
push
2024-08-25 04:38:03 -03:00
002a4c31c1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-12 22:06:15 -03:00
ca8ce67cd6
mail
2024-04-10 20:54:04 -03:00
ffcb0d9460
forgot to push
2024-01-02 14:59:32 -03:00
c660811fe8
Merge pull request #16027 from DeltaFire15/modsuit-updates
...
Some modsuit updates
2024-01-01 21:08:56 -05:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
27bdd4b732
aiModule > ai_module
2023-12-17 23:20:43 -03:00
a9af463fdf
fixes a broken technode icon
2023-11-13 14:03:46 +01:00
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03: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
2bf781580e
Merge branch 'master' into new-decal-painter
2023-02-15 20:06:29 -03:00
2b8a20bae2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-12 22:59:51 -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
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
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
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
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
f083852b6f
all modules available from mechfab
2022-12-20 02:03:57 -07:00
d3c72669d9
clean up & remove longfall boots
2022-12-20 02:03:45 -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
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
f039efca97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-27 01:19:55 -03:00
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
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
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
527b85e4a4
woopsie
2022-09-17 02:00:47 -07:00
59ef5bbcf1
port of the positronic alert console
2022-09-17 01:55:55 -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
b73b49a8b6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-12 17:18:28 -03:00
SandPoot