Commit Graph

86 Commits

Author SHA1 Message Date
QuoteFox
0d487e3eb9 Proper fixes and returning to monkey. 2021-03-20 19:16:50 +00:00
QuoteFox
a9054be26f Revert "return to monkey"
This reverts commit 007ea1f7de.
2021-03-20 19:00:36 +00:00
QuoteFox
007ea1f7de return to monkey 2021-03-20 18:51:08 +00:00
QuoteFox
706ee6d3eb Hyperstation RP beta 0.1 and alot of bug fixes. 2021-03-20 12:36:02 +00:00
QuoteFox
42b1d15981 Revert "Merge pull request #1035 from DragonTrance/various-fixes"
This reverts commit 8436f16c54, reversing
changes made to f512b6d42e.
2021-03-17 23:45:38 +00:00
DragonTrance
9860480e91 fixes various bugs and runtimes 2021-03-17 12:31:18 -07:00
DragonTrance
49bbcefba8 try this again 2021-03-08 15:20:23 -07:00
DragonTrance
a2a11ce30b Revert "loadouts override job outfits"
This reverts commit 6d9c5213fe.
2021-03-08 14:14:53 -07:00
DragonTrance
6d9c5213fe loadouts override job outfits 2021-03-08 11:22:07 -07:00
QuoteFox
74fd8d8f13 Stat panel fixes (Not done) 2021-02-28 03:58:07 +00:00
DragonTrance
e0961b1a2e junior spawning fix 2021-02-26 23:13:57 -07:00
QuoteFox
6ca9ac4123 Revert "Revert "Tg status tab""
This reverts commit b4fa877cc7.
2021-02-27 04:30:52 +00:00
QuoteFox
b4fa877cc7 Revert "Tg status tab"
This reverts commit 931f3ca63b.
2021-02-27 04:02:22 +00:00
QuoteFox
931f3ca63b Tg status tab
finally.
2021-02-27 01:47:19 +00:00
QuoteFox
39a5e2863e final touches to part 1
final touches to part 1
2021-01-29 01:08:23 +00:00
QuoteFox
ecf93da4b1 Economy part 1
Economy part 1
2021-01-25 10:47:15 +00:00
Archie
f22a21f8cb Revert "Merge pull request #910 from quotefox/revert-905-AAAAAAAAAEEEEEEEEEEEEEEEEEEEEEWOOOOOYEEEAHAPRTNER"
This reverts commit 3c0c4c41a1, reversing
changes made to e79656c1ba.
2021-01-21 03:07:29 -03:00
Dahlular
893bd14014 Revert "ports hat throwing" 2021-01-20 09:20:55 -07:00
CygnusB
edf030d4b7 YEEHAWPARTDNERSYES
YEAAHHFDG
2021-01-19 18:28:13 -03:00
Timothy Teakettle
5cca6129a5 Regal Rats + Mice in hat 2021-01-15 21:18:12 -03:00
QuoteFox
83567cf685 Ports techweb backend refactor & co.
from https://github.com/Citadel-Station-13/Citadel-Station-13/pull/9737
2021-01-15 18:28:36 +00:00
kevinz000
123d482898 micro opt 2021-01-10 04:29:48 -03:00
Archie
c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 15:20:47 -03:00
Archie
78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000
939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
Lin
02da471330 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2021-01-06 15:39:13 -03:00
Ghom
ca735a752e Merge pull request #10505 from LetterN/beep-boom
better electropack ui
2021-01-06 14:57:15 -03:00
Ghom
291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
Chloe Carver-Brown
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
Dip
c5842337f1 Forgot one 2020-12-02 18:18:29 -03:00
kevinz000
0fa75009fe Merge pull request #10227 from Putnam3145/quirk-fix
Probably fixes only neutral traits existing
2020-12-02 18:14:55 -03:00
Dip
9d3f5fd445 These are not the same. 2020-11-22 15:10:58 -03:00
Dip
8bde734e7a embiggen blacklist 2020-11-22 05:51:25 -03:00
Dip
88a5ecf523 Fix2 2020-11-22 02:21:16 -03:00
Dip
2a5c61dc45 fuck me 2020-11-22 01:29:01 -03:00
JaySparrow
1d4f134104 Anonymous voting
Shhhhhhhhhhh
2020-11-14 17:27:37 -06:00
QuoteFox
d41fad308a Swapped the opt-in indicators. 2020-11-11 16:18:17 +00:00
Dip
6eebc1d649 Typing Indicators 2020-11-10 01:52:06 -03:00
Dip
b1c2149590 Remove mapload reebe 2020-11-07 22:37:00 -03:00
JaySparrow
d64ead68ac Merge branch 'master' into Dynamic2 2020-11-03 00:39:13 -06:00
JaySparrow
8d1ef78a58 buncha stuff
Hoo boy, lost power for a week, this should have been done so long ago
2020-11-03 00:35:55 -06:00
kevinz000
a86199c99f Merge pull request #9241 from Linzolle/oracleui
Ports Oracle UI framework, and updates UI for paper and disposal bins.
2020-11-02 18:14:44 -03:00
Kabra_men
64ee851bdf Ports selectable prostethic limb from Yog + quirk blacklist and two other new quirks 2020-10-22 01:23:27 -03:00
Dip
fa20d21b96 SHITCODE: BECOME MODULAR 2020-10-16 18:41:40 -03:00
Dip
417a0d9d4a Jukeboxes Finally Work 2020-10-13 14:55:34 -03:00
JaySparrow
ebf705f33e Dynamic Tweaks
Just work damn you
2020-10-12 21:32:32 -05:00
QuoteFox
631090cf04 Dynamic glidespeed
ported from yogstation
2020-10-05 03:58:10 +01:00
kevinz000
b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
kevinz000
014bc3e026 Merge pull request #10046 from Ghommie/Ghommie-cit424
Ports flag for bespoke elements.
2020-10-02 00:51:46 -03:00
kevinz000
4714bd9012 initial element 2020-10-01 22:36:19 -03:00