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

149 Commits

Author SHA1 Message Date
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Artur
0867f92c4a Fixes APC Interface locks 2020-07-10 19:52:49 +03:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur
765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
Detective Google
715b1f85da prevents shunted AIs from doomsdaying (tg#51284) 2020-06-22 15:53:55 -05:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03: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
Ghom
cea958f822 Fixing various issues. (#12368) 
* Fixing various issues.

* Lights.
 2020-05-28 00:36:57 -07:00
Artur
ff57c5a294 Fixes APC and makes sleeper work again 2020-05-22 16:44:21 +03:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Artur
a16f2df71c Cleans up after oracleUI 
Disablers paper for now until markdown paper is done
 2020-05-19 20:34:45 +03: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
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
Ghommie
60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
kevinz000
5c5fc37959 Introducing noitatsxoB (#12073) 
* okay

* ok

* ok

* ok

* ok

* why am i doing this

* WHY DID I DO THIS

* mirror doesn't work

* compile

* shuttles should work

* fix engine

* fix engine

* off by 1

* ok

* adds proccall to write next map

* haha post processing funny

* fixes

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-06 17:50:50 +02:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +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
Putnam3145
5108bf1fc3 Stuff about power (#11664) 
* Overhauled how APCs work, I guess

* Makes cells drain like before
 2020-04-06 04:26:14 +02:00
actioninja
abde27c098 layer changes 2020-03-28 23:50:08 -07:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Ghommie
698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
Seris02
eb5835f668 fixes apcs 2020-02-12 21:35:51 +08:00
Seris02
0b1cb9db6d timer'd 2020-02-08 15:25:11 +08:00
Ghom
e7e13e99b8 Update apc.dm 2020-02-07 07:32:06 +01:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Seris02
49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghom
bb1f65813e Merge pull request #10858 from Citadel-Station-13/kevinz000-patch-4 
Fixes APC ui_data runtime
 2020-02-02 18:06:44 +01:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000
e0f967eaa2 Update apc.dm 2020-02-02 02:57:14 -07:00
Ghommie
cbcb9f32ba Fixes maploaded APC terminals direction. 2020-02-02 04:21:30 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Seris02
4454eba40b fixed 2020-01-23 16:12:12 +08:00
Seris02
934c8fe533 updates + thingamajig 2020-01-23 15:25:45 +08:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Ghommie
5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
Seris02
5524b0fa03 yes. 2020-01-20 13:00:24 +08:00
Seris02
bb6fac4390 I shall actually compile it this time 2020-01-19 17:01:51 +08:00
Seris02
1ee7885392 re:woops 2020-01-19 16:28:12 +08:00
Seris02
f54417f99e fixes 2020-01-19 15:50:48 +08:00
Seris02
fdf3871cb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-18 18:30:51 +08:00