9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
abdafe15fa
fuck
2020-07-26 15:21:24 -05:00
1990f75957
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-25 23:46:27 -07:00
75213ceef2
Update LINDA_turf_tile.dm
2020-07-25 13:58:38 -07:00
ddc10e625e
Merge pull request #12806 from Citadel-Station-13/silicons-patch-33
...
adds some more virtual data returns for gas mixture vv (temp, volume, pressure, heat capacity, energy)
2020-07-23 13:20:29 -05:00
55754023ba
Update gas_mixture.dm
2020-07-23 10:32:21 -07:00
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
1a040dd2a6
changes
2020-07-18 18:44:17 -07:00
7c5d4f863d
click cd breakout
2020-07-18 18:10:21 -07:00
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
a4478b0cda
it continues
2020-07-17 22:38:28 +01:00
f1abe0651b
Update gas_mixture.dm
2020-07-17 12:54:48 -07:00
329ba4d823
Update gas_mixture.dm
2020-07-17 12:53:43 -07:00
92ed5d3201
Merge branch 'master' into TGUI-3.0
2020-07-16 15:59:37 +03:00
7f9571f239
ok
2020-07-15 17:17:09 -07:00
b279c82bb2
whew
2020-07-15 17:10:08 -07:00
dba5855929
epic
2020-07-15 17:01:22 -07:00
96fb3cad8f
ok
2020-07-15 17:00:17 -07:00
6fbd7914f5
stuff
2020-07-15 16:58:44 -07:00
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
c9c8285603
Merge pull request #12723 from silicons/atmos_555
...
atmos microoptimizations
2020-07-11 15:44:19 -05:00
9d6003b920
ok
2020-07-09 21:06:03 -07:00
31da81aff4
Merge pull request #12217 from Putnam3145/putnamos-for-real
...
The real fastmos: C++ monstermos port
2020-07-09 20:37:18 -07:00
9de8483bcf
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-09 22:14:20 +03:00
93e0ceded7
Update canister.dm
2020-07-09 03:01:56 -07:00
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
3154e8c596
Updates components to TG and fixes can
2020-07-06 10:58:48 +03:00
a304ed7f49
Canister and paper updates
...
should fix papah exploits, though some runtiming is occuring
2020-07-04 16:14:42 +03:00
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
bfe8ccdfb5
Merge pull request #11627 from kevinz000/combat_rework
...
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
5990239cfa
Update portable_atmospherics.dm
2020-06-10 14:46:16 -07:00
70d1574c26
Update pipes.dm
2020-06-10 14:45:19 -07:00
41d186186b
Update components_base.dm
2020-06-10 14:43:54 -07:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
05fe0c7dcc
ok
2020-05-30 00:59:29 -07:00
8e945bca4d
Made restoring roundstart air restore the archive too ( #12367 )
2020-05-28 00:36:51 -07:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
ab93d80289
Reworks cryo knockout times ( #12267 )
...
* Update cryo.dm
* Update cryo.dm
* Update cryo.dm
2020-05-18 02:43:20 +02:00
335f5a37b9
Plane adjustments on several low layer objects. ( #12286 )
2020-05-17 17:02:57 -07:00
7c7147cb3e
Field of Vision component. ( #12075 )
...
* Hopeless WIP for vision cones.
* Core component and hooks done
* Removing clutter.
* linter bashing me for using statements as args.
* Ok.
* continue
* bring back the macro
* Configs and openspace filter.
* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.
* view, viewers and spoopy ghosts.
* Renamed component, admin fun button and snowflakes robots.
* Whoopsie.
* Yikes
* test merge tweak.
* radial yaketi sax.
* Fixed tgui UIs, some messages not displayed to the target.
* Documentation and a little bugfix.
* Pulling QoL, seventh plane made in this PR.
* Fix.
* Tweaks and improvements.
* Update randomverbs.dm
2020-05-15 15:25:04 -07:00
dabdf16eac
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
0b2b34e867
Fixes multi-z proper
2020-05-12 19:13:39 -07:00
e243752369
Removed tossing from pressure diff (for now)
2020-05-12 16:10:20 -07:00
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
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
17826fe98b
monstermos wow
2020-05-11 22:00:04 -07:00
silicons