shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,029 Commits 5 Branches 0 Tags
dcd2c11f4e6e47ddbedd34dcd7e4bbc76328baff
Commit Graph

611 Commits

Author SHA1 Message Date
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry 
Ok ok hear me out: Implements unarmed parry.
 2020-07-18 17:02:02 -05:00
silicons
a8e2b84ad8 Merge pull request #12763 from zeroisthebiggay/b 
hopefully fixes records possibly
 2020-07-17 17:10:40 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Artur
c964cadd85 Makes amber alert work 2020-07-14 16:15:32 +03:00
zerothebigboy
5b3050f692 b 2020-07-13 17:01:41 -04:00
zerothebigboy
4c0248835f b 2020-07-13 17:01:23 -04:00
zerothebigboy
85f8491003 b 2020-07-13 14:45:18 -04:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
silicons
4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact 
port examines and eye contact
 2020-07-11 00:14:47 -07:00
Artur
9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01: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
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie
afb5b5237c linter & stuff. 2020-07-06 22:42:32 +02:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Ghommie
780f30bd4d Fixing cloning 2020-07-04 21:01:44 +02:00
Artur
82c6a02feb More Testmerge fixes 2020-07-03 15:34:45 +03:00
Artur
7781296fb9 DNA CONSOLE FIX 2020-07-03 11:09:55 +03:00
Artur
365aadec54 Trying to fix the dna t 2020-07-03 00:55:18 +03:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
kevinz000
1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
SmArtKar
46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Artur
390419cfaa Stupid mistake 2020-06-16 17:21:46 +03:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Ghom
292f1afa3c Quick bandaid for table telescreens/buttons. (#12339) 2020-05-24 13:13:20 -07:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02: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
1682cfd3fd Compile 2020-05-13 13:52:12 +03: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
kevinz000
395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738 
nutrition adjustment wrapper procs from tg.
 2020-05-12 12:28:02 -07:00
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghommie
667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +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
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Artur
120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and 
And fixes to make stuff work
 2020-04-23 17:36:13 +03:00
Artur
1d51b6a8c8 Ports https://github.com/tgstation/tgstation/pull/45444/ 2020-04-23 15:08:24 +03:00
Artur
9d870893fb Beginning work on DNA console TGUI, plus some camera console fixes 2020-04-23 13:24:43 +03:00
Artur
67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00