Jerry Wester
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
silicons
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
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
34eaf93a01
sorters! one-way setting! brazen code borrowing!
2022-12-29 20:18:34 -06: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
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
Putnam3145
617768dd40
Destructive analyzer no longer buy one get 49 free
2022-09-02 15:09:15 -07:00
SandPoot
75dd6a67df
just a little check for if there's anything at all
2022-07-19 21:32:49 -03:00
Putnam3145
6fe08f0a4e
Rebalancing QCD a bit
2022-06-06 20:41:10 -07:00
deathride58
113981b5a8
Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more!
2022-05-21 00:21:58 -04: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
ce7d7a5124
Merge pull request #15594 from SandPoot/stasis-beds-update
...
Makes stasis beds *slightly* less hated
2022-04-27 16:11:34 -07: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
SandPoot
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -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
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03: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
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
SandPoot
16fddbb140
Upload files
2022-03-18 18:35:29 -03:00
SandPoot
aec888a7b6
Update files
2022-03-16 15:17:57 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
Putnam3145
b597675ef4
Fix explosive compressor impossibility
2022-03-14 11:41:20 -07:00
silicons
a3284a0923
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
...
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
silicons
bf9afd846d
Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system
...
[PORT] Removes the non bitflag slot defines
2022-02-26 18:08:28 -07:00
silicons
fe427e7516
Merge pull request #15503 from Arturlang/Bodybuilding
...
Lets the limbgrower make mobs with only a chest
2022-02-26 18:08:12 -07:00
SandPoot
f7ea1f377d
oops, replace all is a hell of a drug
2022-02-25 17:09:31 -03:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
