Putnam
|
3788bc6676
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-17 21:33:13 -08:00 |
|
keronshb
|
69b5164103
|
Merge branch 'master' into RemoteMoodResearch
|
2020-01-16 15:50:11 -05:00 |
|
kevinz000
|
8725ffe916
|
Merge remote-tracking branch 'citadel/master' into nightshift_1
|
2020-01-10 06:12:59 -08:00 |
|
Putnam
|
c0be46e07f
|
balancing/sanity checks
|
2020-01-10 04:23:43 -08:00 |
|
Putnam
|
36a6daa26f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-09 19:09:38 -08:00 |
|
Putnam
|
bdda3f940c
|
it works
|
2020-01-09 18:55:56 -08:00 |
|
keronshb
|
35cd77d433
|
Adds the nanite remote for some programs
Adds a new remote function from tg
|
2020-01-06 20:28:33 -05:00 |
|
kevinz000
|
aac1b42b8f
|
nightshift improvements
|
2020-01-03 00:01:48 -08:00 |
|
BlackMajor
|
8085022d97
|
Couple of changes. Starting on the point bank.
|
2019-12-31 23:28:30 +13:00 |
|
Ghommie
|
4502d7b795
|
Ports improved and simplier fire alarms.
|
2019-12-12 22:44:20 +01:00 |
|
Ghommie
|
8615c0ea8f
|
Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394
|
2019-12-03 02:32:59 +01:00 |
|
Putnam
|
1b310d41bf
|
Filters are now volume-based.
|
2019-11-29 21:23:08 -08:00 |
|
Ghommie
|
d3bce1bbcd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2019-11-27 02:59:08 +01:00 |
|
Ghommie
|
4e05c27cdb
|
Updating supply pods code.
|
2019-11-27 01:54:10 +01:00 |
|
Fermi
|
7548c636c2
|
Too cozy
|
2019-11-20 21:49:21 +00:00 |
|
Fermi
|
a4d61f8571
|
Okay last tweak I'm seriously gonna stop
|
2019-11-20 21:44:02 +00:00 |
|
Fermi
|
bfb5f75016
|
Finishing up final UI adjustments
|
2019-11-20 21:23:54 +00:00 |
|
Fermi
|
b523f241fd
|
Slighty better but UGH why don't you sit on the right like I want.
|
2019-11-20 18:20:36 +00:00 |
|
Thalpy
|
32a1c67171
|
Makes purge function without a body.
|
2019-11-20 15:14:07 +00:00 |
|
Fermi
|
68a30e9969
|
Final pass
|
2019-11-20 12:11:44 +00:00 |
|
Fermi
|
48e1c64c8d
|
Final
|
2019-11-20 11:35:40 +00:00 |
|
Thalpy
|
3abae989df
|
Final settings
|
2019-11-19 16:44:10 +00:00 |
|
Thalpy
|
bf89df7e7b
|
Fixing things
|
2019-11-19 16:03:33 +00:00 |
|
Thalpy
|
c0287cf7b5
|
Reagent sleepers!
|
2019-11-19 14:50:22 +00:00 |
|
Thalpy
|
2eb33afcd6
|
Workin
|
2019-11-19 14:19:51 +00:00 |
|
Fermi
|
9fb6c2f3a3
|
Okay I gotta hop
|
2019-11-19 12:22:53 +00:00 |
|
Thalpy
|
597160ca15
|
Fixed werid stuff.
|
2019-10-15 14:17:36 +01:00 |
|
Thalpy
|
e115c456f3
|
Ohh I'm fixing
|
2019-10-15 13:41:49 +01:00 |
|
Thalpy
|
e71a70f406
|
Adds medolier + bag antics
|
2019-10-15 11:40:07 +01:00 |
|
Thalpy
|
23743c8630
|
Updates chemmaster
|
2019-10-15 11:21:05 +01:00 |
|
Ghommie
|
cac4157894
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-05 22:03:37 +02:00 |
|
Ghommie
|
277f031143
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
|
2019-09-20 02:27:39 +02:00 |
|
Ghommie
|
c813555697
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-09-15 04:05:14 +02:00 |
|
kevinz000
|
591a584785
|
Merge pull request #9275 from Thalpy/InitialD
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
|
2019-09-13 10:43:22 -07:00 |
|
Fermi
|
409cbe876a
|
Okay ACTUALLY does what I want it to.
|
2019-09-11 18:46:32 +01:00 |
|
kevinz000
|
076b6c8699
|
Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
|
2019-09-10 22:04:48 -07:00 |
|
Ghommie
|
9ec97579bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
|
2019-09-03 21:08:09 +02:00 |
|
Ghommie
|
5d1cac62da
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-08-24 13:50:22 +02:00 |
|
Sishen
|
f59b60e83a
|
QOL OOGA BOOGA
|
2019-08-08 01:11:20 -04:00 |
|
Fermi
|
10b2cec485
|
Adds a analyse function for advanced chems
|
2019-08-07 16:52:58 +01:00 |
|
Fermi
|
d080446a77
|
Merge branch 'pr/20'
|
2019-07-28 23:28:19 +01:00 |
|
Sishen
|
a1a626ba29
|
hypovial shit
iddqd
|
2019-07-25 19:11:58 -04:00 |
|
Ghommie
|
b818b1eedd
|
Updating spraycans and crayons code.
|
2019-07-17 15:45:48 +02:00 |
|
Ghommie
|
4df4cbd721
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-15 17:23:01 +02:00 |
|
Thalpy
|
f77bcc9765
|
Merge branch 'master' into master
|
2019-07-14 15:10:32 +01:00 |
|
Ghommie
|
d36bae06a7
|
Ports the Chem Master choose your pill PR plus post-improvements
|
2019-07-12 07:39:17 +02:00 |
|
Ghommie
|
8004165599
|
The big part is done.
|
2019-07-04 00:30:28 +02:00 |
|
Thalpy
|
937d6467e6
|
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
|
2019-06-30 19:16:27 +01:00 |
|
Thalpy
|
e09f189895
|
WELCOME TO PH'S HELL RIDE
|
2019-06-30 01:56:10 +01:00 |
|
Carlen White
|
ccef9c326a
|
Sleepers now show blood level and type for occupants.
https://i.imgur.com/RaMjgt2.png
https://i.imgur.com/qkaBggM.png
Also updated TGUI package.json.
_This has been properly resigned with the correct key._
|
2019-05-20 17:55:25 -04:00 |
|
