kevinz000
|
a45038d214
|
Update pockets.dm
|
2020-02-05 03:31:55 -07:00 |
|
Artur
|
614a44ea18
|
Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting
|
2020-02-04 13:11:02 +01:00 |
|
Artur
|
ed60724a8e
|
Whoops
|
2020-02-04 12:13:14 +01:00 |
|
Artur
|
0391513220
|
Works now
|
2020-02-04 12:05:15 +01:00 |
|
Artur
|
4bd916d08a
|
Adds the initial crafting UI stuff.
|
2020-02-04 10:28:53 +01:00 |
|
Ghom
|
40f7a72e3c
|
Update slippery.dm
|
2020-02-03 20:32:50 +01:00 |
|
Ghom
|
3cb1a0e9c8
|
Update slippery.dm
|
2020-02-03 20:31:57 +01:00 |
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
kevinz000
|
66a2216ef3
|
Merge pull request #10829 from Ghommie/Ghommie-cit544
Fixed and brutalized clown op slippery weapons a little.
|
2020-02-02 03:16:23 -07:00 |
|
Ghommie
|
07b6d278a1
|
fixed and brutalized clown op slippery weapons a little.
|
2020-02-01 04:48:40 +01:00 |
|
Artur
|
8bb0e30036
|
Initial Commit V3
|
2020-01-31 18:17:14 +01:00 |
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
kevinz000
|
603ab65ed1
|
Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
|
2020-01-25 19:33:26 -07:00 |
|
Artur
|
e360ac1d36
|
Conflict fix
|
2020-01-24 23:06:32 +01:00 |
|
kevinz000
|
831ac91917
|
Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
|
2020-01-24 00:25:53 -07:00 |
|
Ghommie
|
5644617786
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2020-01-20 20:59:38 +01:00 |
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02:00 |
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
keronshb
|
69b5164103
|
Merge branch 'master' into RemoteMoodResearch
|
2020-01-16 15:50:11 -05:00 |
|
Artur
|
1f718df41a
|
Reverts crafting changes
|
2020-01-16 14:26:36 +02:00 |
|
Artur
|
eb77c6b86b
|
This too
|
2020-01-16 12:57:11 +02:00 |
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
Ghommie
|
f45f979c27
|
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
|
2020-01-12 23:21:03 +01:00 |
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
keronshb
|
a7af5203e7
|
This is a test to see if they all work together
Title
|
2020-01-06 20:29:44 -05: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 |
|
Ghom
|
d07d436ba2
|
Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
|
2020-01-06 21:47:15 +01:00 |
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
Hatterhat
|
7c98656939
|
upstream merge
|
2020-01-04 01:48:50 -06:00 |
|
Hatterhat
|
186194418e
|
tg 43454+43688 port, tweaks w/ trilby, db crate
|
2020-01-04 01:33:32 -06:00 |
|
Linzolle
|
74c308c16c
|
runtime fix
|
2020-01-01 22:23:16 -06:00 |
|
kevinz000
|
ec67a38093
|
Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
|
2019-12-31 19:32:05 -08:00 |
|
keronshb
|
baf8b28f3a
|
Fixes Reduced Diagnostics and adds disks
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
|
2019-12-29 16:03:38 -05:00 |
|
kappa-sama
|
3fad4edae0
|
mouth
|
2019-12-28 23:57:07 -05:00 |
|
keronshb
|
390cfd8b64
|
Nanite ports from /tg/
Ports a couple of the newer nanite features from /tg/
|
2019-12-28 16:56:17 -05:00 |
|
Ghommie
|
d88f50ac15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-23 05:02:31 +01:00 |
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
Ghommie
|
9db79ff958
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-20 23:40:21 +01:00 |
|
Linzolle
|
70e50e57cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
|
2019-12-17 20:21:49 -06:00 |
|
Trilbyspaceclone
|
0f5c8db456
|
Merge branch 'master' into donut
|
2019-12-17 15:12:51 -05:00 |
|
Putnam3145
|
b8c5290011
|
Merge pull request #10026 from Linzolle/neck-slice
Neck slice
|
2019-12-17 11:58:00 -08:00 |
|
Putnam3145
|
ed44b3130c
|
Merge pull request #10172 from Ghommie/Ghommie-cit460
Porting several quirks code updates.
|
2019-12-17 11:51:03 -08:00 |
|
Lin
|
237fbaa02d
|
Merge pull request #10180 from Ghommie/Ghommie-cit462
[s] virtual reality component improvements, fixes and documentation.
|
2019-12-17 01:05:10 +00:00 |
|
Ghommie
|
80f47872d7
|
My head splodes.
|
2019-12-15 20:31:36 +01:00 |
|
Ghommie
|
081d3df750
|
This is one serious Pepe Silvia complex.
|
2019-12-14 22:52:40 +01:00 |
|
Ghommie
|
3891c91799
|
virtual reality component improvements, fixes and documentation.
|
2019-12-14 17:19:48 +01:00 |
|
Ghommie
|
b39ae815f3
|
Porting several quirks code updates.
|
2019-12-13 16:12:04 +01:00 |
|
Ghommie
|
651370c5b4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2019-12-11 21:10:24 +01:00 |
|
Ghommie
|
19a3aca619
|
I fear for my powernet
|
2019-12-10 15:33:15 +01:00 |
|