shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,699 Commits 5 Branches 0 Tags
49941ea2e675ee2a9ce54e4fa4e4159a48ca89e1
Commit Graph

597 Commits

Author SHA1 Message Date
Arturlang
92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
silicons
7f9571f239 ok 2020-07-15 17:17:09 -07:00
silicons
b279c82bb2 whew 2020-07-15 17:10:08 -07:00
silicons
dba5855929 epic 2020-07-15 17:01:22 -07:00
silicons
96fb3cad8f ok 2020-07-15 17:00:17 -07:00
silicons
6fbd7914f5 stuff 2020-07-15 16:58:44 -07:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Lin
c9c8285603 Merge pull request #12723 from silicons/atmos_555 
atmos microoptimizations
 2020-07-11 15:44:19 -05:00
silicons
9d6003b920 ok 2020-07-09 21:06:03 -07:00
silicons
31da81aff4 Merge pull request #12217 from Putnam3145/putnamos-for-real 
The real fastmos: C++ monstermos port
 2020-07-09 20:37:18 -07:00
Artur
9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
silicons
93e0ceded7 Update canister.dm 2020-07-09 03:01:56 -07: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
3154e8c596 Updates components to TG and fixes can 2020-07-06 10:58:48 +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
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Lin
bfe8ccdfb5 Merge pull request #11627 from kevinz000/combat_rework 
"Unofficial" Combat Rework Part 3: Blocking/Parrying
 2020-06-12 16:39:11 -05:00
kevinz000
5990239cfa Update portable_atmospherics.dm 2020-06-10 14:46:16 -07:00
kevinz000
70d1574c26 Update pipes.dm 2020-06-10 14:45:19 -07:00
kevinz000
41d186186b Update components_base.dm 2020-06-10 14:43:54 -07:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
Putnam3145
8e945bca4d Made restoring roundstart air restore the archive too (#12367) 2020-05-28 00:36:51 -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
Ghom
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
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
0b2b34e867 Fixes multi-z proper 2020-05-12 19:13:39 -07:00
Putnam
e243752369 Removed tossing from pressure diff (for now) 2020-05-12 16:10:20 -07: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
c859cfee6b Bad merge, ouchies 2020-05-11 17:36:26 -07:00
Putnam
478400979d Added a fallback, just in case (may not work?) 2020-05-11 17:13:47 -07:00
Putnam
f4f80594bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-11 17:10:55 -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
Putnam
7004001e4b Brings back the gas archive 2020-05-09 11:23:38 -07:00
Ghommie
60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
Ghom
a273fc0fed Merge branch 'master' into Ghommie-cit721 2020-05-07 18:18:54 +02:00
Ghommie
f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 2020-05-05 05:09:29 +02:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Ghommie
76e1ee80b7 Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them" 2020-05-03 07:12:41 +02: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
kevinz000
3cb4ef24ba Merge pull request #12081 from Ghommie/Ghommie-cit716 
Fixing some runtimes with kevinz skills and holodeck hotspots.
 2020-05-02 15:55:10 -07:00
Ghommie
f62aaddb1d Fixing some runtimes with kevinz skills and holodeck hotspots. 2020-05-01 23:22:23 +02:00