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

401 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
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
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
silicons
45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819 
Porting further material datum features and improvements.
 2020-06-27 14:53:28 -07:00
Artur
765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Detective Google
ab05e48149 adds the medical gygax 2020-06-20 16:22:28 -05:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Artur
b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
Ghom
d7954ca077 Yet another PR fixing some issues. (#12424) 2020-06-02 15:29:01 -07:00
Ghom
a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347) 
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
 2020-06-02 15:22:06 -07:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268) 
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
 2020-05-18 04:46:57 -07:00
Lin
72b7209c00 Merge pull request #12258 from DeltaFire15/neovgre-stuff 
What if you wanted to pilot Neovgre, but god said 'Zrpu znpuvar oebxr.'.
 2020-05-17 16:43:07 +00: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
DeltaFire
87492b1a35 Changes repair value 
0.5% per process tick ~ 1sec, so ~200sec to fully heal it without outside interference if on clockie floor.
 2020-05-14 20:29:30 +02:00
DeltaFire
07299f4cf0 ... why do people not proofread their code 
Fixes
1. Neovgre recharging near sigils
2. Neovgre healing on brass floor
3. ... the weapon firing sound
 2020-05-14 20:06:03 +02:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Trilbyspaceclone
43f6acd81b *crys* 2020-05-08 15:42:35 -04:00
Trilbyspaceclone
a711f312ce Update mecha_construction_paths.dm 2020-05-08 15:37:17 -04:00
Trilbyspaceclone
c9f8f55945 Update mecha_construction_paths.dm 2020-05-08 15:29:20 -04:00
Trilbyspaceclone
e0d56363d4 Update mecha_construction_paths.dm 2020-05-08 15:13:13 -04:00
Trilbyspaceclone
5ab1d04154 Update mecha_construction_paths.dm 2020-05-08 14:44:27 -04:00
Trilbyspaceclone
9caa236e85 Update mecha_construction_paths.dm 2020-05-08 14:22:15 -04:00
TrilbySpaceClone
47319cc8c9 What if mechs give more information? 2020-05-08 11:28:39 -04: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
b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +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
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
kevinz000
6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650 
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
 2020-03-28 16:00:48 -07:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Trilbyspaceclone
e368a7d8e3 Update medical_tools.dm 2020-03-26 17:21:10 -04:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
necromanceranne
8caea8e83a Ports tg#44633 2020-03-10 23:59:50 +11:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000
424eb48d9e fixes 2020-02-24 01:59:45 -07:00
Seris02
c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00