silicons
|
bc9dbc0060
|
Update circulator.dm
|
2020-12-15 14:00:20 -07:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
ArchieBeepBoop
|
9eff4147fd
|
Fixes the Layer 3 Outlet Injector mapping asset being on the wrong layer (#13633)
* why is this on the wrong layer?
* ahem, icon state.
Co-authored-by: Dip <gabriel.spm002@gmail.com>
|
2020-11-01 22:02:15 +01:00 |
|
Letter N
|
9eb7aaa2d1
|
fixes pumps and reverts this small vending change
|
2020-08-07 16:12:44 +08:00 |
|
Letter N
|
8f0f30f6f7
|
lazy datacore fix
|
2020-08-06 17:27:51 +08:00 |
|
Letter N
|
7c7d635193
|
what if atmos relief works? and all the other ui's gets updated
|
2020-08-04 12:54:55 +08:00 |
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
silicons
|
9ff94e019b
|
Merge pull request #12924 from SiliconMain/analyzer
Ports long range atmos analyzer from skyrat
|
2020-07-29 01:09:48 -07:00 |
|
Letter N
|
5d4bb48628
|
another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator
|
2020-07-29 15:10:01 +08:00 |
|
SiliconMain
|
abdafe15fa
|
fuck
|
2020-07-26 15:21:24 -05:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
silicons
|
58e26c540c
|
merge from master
|
2020-07-20 10:18:44 -07:00 |
|
silicons
|
1a040dd2a6
|
changes
|
2020-07-18 18:44:17 -07:00 |
|
silicons
|
7c5d4f863d
|
click cd breakout
|
2020-07-18 18:10:21 -07:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
kevinz000
|
41d186186b
|
Update components_base.dm
|
2020-06-10 14:43:54 -07:00 |
|
Artur
|
9d04b0835b
|
Conflicts galore
|
2020-05-21 21:08:12 +03:00 |
|
kevinz000
|
ab93d80289
|
Reworks cryo knockout times (#12267)
* Update cryo.dm
* Update cryo.dm
* Update cryo.dm
|
2020-05-18 02:43:20 +02:00 |
|
Ghom
|
335f5a37b9
|
Plane adjustments on several low layer objects. (#12286)
|
2020-05-17 17:02:57 -07:00 |
|
Artur
|
dabdf16eac
|
Coonflict fiiixeeess
|
2020-05-13 12:56:17 +03:00 |
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
Putnam
|
8458f97692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-12 13:34:31 -07:00 |
|
Ghommie
|
7fb96ab0cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-05-12 20:06:59 +02:00 |
|
Putnam
|
17826fe98b
|
monstermos wow
|
2020-05-11 22:00:04 -07:00 |
|
Putnam
|
121d594faa
|
Fixes
|
2020-05-11 17:09:35 -07:00 |
|
Putnam
|
e8d7da56f4
|
Ported C++mos from yogs (help me)
|
2020-05-11 15:44:26 -07:00 |
|
kevinz000
|
c1436c4c7b
|
Maptick lag minimization port (#12066)
* extools.dll
* backend
* queued pipenet builds
* oh yeah we don't have that
* wow
* Update air.dm
|
2020-05-03 03:34:33 +02:00 |
|
Ghommie
|
a194d7dafe
|
merge conflict and job/dept discounts support.
|
2020-05-03 02:11:05 +02:00 |
|
Psody-Mordheim
|
030201e5de
|
Two lines (#12071)
|
2020-05-01 18:42:01 +02:00 |
|
Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
Artur
|
80b47ec1c0
|
Ports https://github.com/tgstation/tgstation/pull/50497
|
2020-04-23 09:55:28 +03:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
spookydonut
|
230e5fca20
|
fix everything
|
2020-04-11 15:32:09 +08:00 |
|
kevinz000
|
9420424c8f
|
Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-06 00:14:13 -07:00 |
|
Ghommie
|
bb7bfc04cc
|
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-05 01:47:04 +01:00 |
|
kevinz000
|
045d5b2dbf
|
fixes
|
2020-02-27 20:06:52 -07:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
kevinz000
|
ecbb7767c3
|
Update cryo.dm
|
2020-02-11 23:07:47 -07:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
Artur
|
db36a90e35
|
Fixes.
|
2020-01-30 19:23:38 +01:00 |
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
Ghom
|
9ee208dd4f
|
Merge pull request #10722 from Putnam3145/fix-relief
Relief valve fixes
|
2020-01-27 05:37:53 +01: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 |
|
Putnam
|
6df56a2cf8
|
properly fixed flags, also made it close on one side's pressure
|
2020-01-25 18:31:53 -08:00 |
|