silicons
|
e03948dcba
|
Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
|
2020-07-16 17:28:42 -07:00 |
|
Letter N
|
8083efd1ad
|
https://github.com/tgstation/tgstation/pull/51864
|
2020-07-16 20:29:56 +08:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
Timothy Teakettle
|
02f46322ad
|
port examine
|
2020-07-09 18:32:45 +01:00 |
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
Ghom
|
e7d19f512e
|
Merge pull request #12397 from Rohesie/cooldown
Ports TGMC timer cooldowns
|
2020-07-06 22:54:58 +02:00 |
|
Artur
|
8cbe248465
|
Updates paper to TG
|
2020-07-06 13:09:02 +03:00 |
|
Artur
|
a304ed7f49
|
Canister and paper updates
should fix papah exploits, though some runtiming is occuring
|
2020-07-04 16:14:42 +03:00 |
|
L
|
3aefc8ae10
|
tg changes
|
2020-06-27 07:01:19 -03:00 |
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
Timothy Teakettle
|
38bf529f3c
|
a tonne of fixes
|
2020-06-11 20:18:36 +01:00 |
|
Timothy Teakettle
|
4c55e86da7
|
part 2
|
2020-06-10 23:14:25 +01:00 |
|
Timothy Teakettle
|
8ec5672b85
|
tonne of fixes
|
2020-06-10 21:14:08 +01:00 |
|
Timothy Teakettle
|
95b8cd3956
|
first port
|
2020-06-10 20:33:01 +01:00 |
|
Artur
|
19f215477e
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-30 18:52:02 +03:00 |
|
L
|
4b19e5863e
|
cooldown
|
2020-05-30 06:16:34 -03:00 |
|
Artur
|
a6d7a33669
|
Exploit fixes for pappah
|
2020-05-29 18:23:33 +03:00 |
|
Artur
|
7faa0cb5fc
|
Guh
|
2020-05-27 20:10:50 +03:00 |
|
Artur
|
3c973816d1
|
Ports https://github.com/tgstation/tgstation/pull/51125/
|
2020-05-27 12:48:25 +03:00 |
|
Ghom
|
85186a9714
|
Porting updates related to material datums. (#12317)
* Porting updates related to material datums.
* art_type
* oh oh
|
2020-05-25 14:21:00 -07:00 |
|
Ghom
|
ab5d65a454
|
Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
|
2020-05-24 13:05:15 -07:00 |
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|
Artur
|
bbbb4c611d
|
Fixes asset cache
|
2020-05-19 21:13:00 +03:00 |
|
Artur
|
a16f2df71c
|
Cleans up after oracleUI
Disablers paper for now until markdown paper is done
|
2020-05-19 20:34:45 +03:00 |
|
MrJWhit
|
1c7e9b7512
|
Adds more cogstation paperwork, for future use (#12225)
* Extra cogstation papers
* Hopefully fixes HTML issues
* Extra quotation mark, maybe that'll get it
|
2020-05-16 07:38:42 -07:00 |
|
kevinz000
|
d60932ca5d
|
Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
|
2020-04-12 16:16:37 -07:00 |
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
Ghommie
|
7c1e5aa2c9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
|
2020-04-09 15:46:19 +02:00 |
|
nik707
|
09c8bd40ec
|
Merge pull request #11575 from EmeraldSundisk/coggers
as of yet unfinished, being added in the background for ease of further development
|
2020-04-04 13:18:07 -05:00 |
|
Ghommie
|
c3faf94d8f
|
WIP
|
2020-03-30 05:29:39 +02:00 |
|
Ghommie
|
41e2c60d4a
|
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
|
2020-03-27 22:52:43 +01:00 |
|
kevinz000
|
57429493c6
|
Merge pull request #11581 from Ghommie/Ghommie-cit637
M/F body preferences.
|
2020-03-23 10:34:02 -07:00 |
|
Ghommie
|
76ff0d4931
|
M/F body preferences.
|
2020-03-22 19:47:48 +01:00 |
|
Ghommie
|
7747c84b71
|
Two runtimes, one fix.
|
2020-03-21 23:23:31 +01:00 |
|
Trilbyspaceclone
|
581c537fba
|
Update pen.dm (#11533)
|
2020-03-20 02:38:52 +01:00 |
|
EmeraldSundisk
|
6855d2d9a4
|
Let's try this again.
|
2020-03-18 14:29:34 -07:00 |
|
Ghommie
|
59b1a223a3
|
Ok, done.
|
2020-03-08 22:51:36 +01:00 |
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
kevinz000
|
3e77952652
|
Merge pull request #11216 from Putnam3145/rename-logging
[S] Adds rename logging
|
2020-02-24 02:27:27 -07:00 |
|
Putnam
|
f7e0eb43f8
|
Adds rename logging
|
2020-02-23 22:53:20 -08:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Ghommie
|
7f14fa3c71
|
not-so-wip now.
|
2020-01-31 19:20:59 +01:00 |
|
kevinz000
|
3bf0e1d5c4
|
Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
|
2020-01-28 17:57:26 -07:00 |
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
Ghommie
|
856ef236f3
|
Further runtime fixes by AnturK.
|
2020-01-24 23:01:30 +01:00 |
|
Ghommie
|
56d31b0c8c
|
neuter/plural gender fixes.
|
2020-01-23 22:50:30 +01:00 |
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|