 Artur
|
82ccfc40dc
|
/obj/screen --> /atom/movable/screen
|
2021-07-29 13:57:19 +03:00 |
|
|
Putnam3145
|
f77495f45d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-06-21 02:19:51 -07:00 |
|
|
bunny232
|
03b921a121
|
Update tank.dm
|
2021-06-14 06:12:04 -04:00 |
|
|
Putnam
|
bcbcd6bfce
|
aoaoaoao
|
2021-06-11 18:16:47 -07:00 |
|
|
Putnam
|
3b25f3e199
|
Started expanding auxgm a bit
|
2021-06-10 04:40:23 -07:00 |
|
|
Putnam
|
268d3ec408
|
Fixed the funny UI stuff
|
2021-06-08 18:22:15 -07:00 |
|
|
Putnam
|
86177c51c4
|
auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
|
2021-06-08 09:54:28 -07:00 |
|
|
Putnam
|
80e8c8af4a
|
WHOOPS I SWAPPED FILTERS
|
2021-06-08 02:40:32 -07:00 |
|
|
Putnam
|
d03bf641dd
|
extreme optimization project to maybe fix game
|
2021-06-06 21:58:24 -07:00 |
|
|
Putnam
|
f1e55f2df0
|
Paranoid updates to maybe fix air duplication
|
2021-03-20 22:02:47 -07:00 |
|
|
Putnam
|
cc360288bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-03-08 14:46:46 -08:00 |
|
|
Putnam
|
f07a9c13fb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-03-02 01:44:58 -08:00 |
|
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
|
Letter N
|
2be4c76add
|
THIS FIXES IT (well it should :) )
|
2021-02-22 21:05:07 +08:00 |
|
|
Letter N
|
636d6bf32f
|
grr atmos
|
2021-02-19 10:39:06 +08:00 |
|
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
|
Letter N
|
92eb4fb684
|
filter
|
2021-02-12 12:40:24 +08:00 |
|
|
Putnam
|
f05df1c7de
|
Huge optimizations+some fixes
|
2021-01-19 17:48:20 -08:00 |
|
|
Putnam
|
186bb483b1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-01-06 23:55:24 -08:00 |
|
|
siliconsandGitHub
|
bc9dbc0060
|
Update circulator.dm
|
2020-12-15 14:00:20 -07:00 |
|
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
|
|
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 |
|
|
Putnam
|
3c4eff605d
|
broken but compiles and runs sans panics
|
2020-10-28 23:07:59 -07: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 |
|
|
siliconsandGitHub
|
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 TeakettleandGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
ab93d80289
|
Reworks cryo knockout times (#12267)
* Update cryo.dm
* Update cryo.dm
* Update cryo.dm
|
2020-05-18 02:43:20 +02:00 |
|
|
GhomandGitHub
|
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 |
|