445d94f335
haha whew
2020-06-17 21:32:10 -07:00
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
7fbfb4ad0e
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01:00
77c428479e
changes the inefficient attack message string and threshold. ( #12498 )
2020-06-12 17:08:10 -07:00
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -07:00
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
5b6e797c4f
desword adjustments
2020-05-30 23:43:05 -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
433bd1af79
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-27 18:11:15 -07:00
968426fd48
Combat mode component. ( #12338 )
...
* Combat mode component.
* Whoops.
* test.
* Oh
* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
d88c815845
vars ( #12373 )
2020-05-28 01:18:26 +02:00
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
95c6c7345c
implementations
2020-05-24 14:56:01 -07:00
07df0102f8
Demodularizing a few reagents, a client var, the rest hud button. ( #12329 )
2020-05-24 13:21:14 -07:00
e9068f05eb
let's play the optimization game featuring lighting ( #12310 )
...
* debug proc
* kinda quirky
* let's play the lighting game
* let's play the macro game
* let's play the refactor game
* let's play the optimization game
* let's play the optimization game x2
* yeehaw
* e
* let's play the memory game
* fix
* lighting fix
* sanitization and checks
* mh
* hotkeys fix
* ok
2020-05-23 22:47:42 +02:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
7f38e0714b
Skill calculation fixes, tweaks, antag and brain damage modifiers. ( #12302 )
...
* Skill calculation fixes, tweaks, antag and brain damage modifiers.
* Experience through patience.
* Priority Fix etcetera.
2020-05-20 18:42:58 -07: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
10944d1b52
The bag of holding (and I guess backpack) balancing pass no one asked for ( #11864 )
...
* Ok
* whew
* ok
* fix
* ehh
* fix
* buff disks
* Update _compile_options.dm
* Update tgstation.dme
2020-05-15 03:44:56 +02:00
616d104c23
Merge pull request #12189 from Ghommie/Ghommie-cit735
...
Skill modifier datums.
2020-05-14 04:46:24 -07:00
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
dbfa8ac1ea
Merge branch 'master' into typing_indicators
2020-05-11 05:00:23 -07:00
6b9fc7eccf
Merge pull request #12169 from Ghommie/Ghommie-cit734
...
Porting some radial menu updates, and that one clown mask skin.
2020-05-10 14:14:19 -07:00
dd7db603d2
Merge pull request #12159 from Ghommie/Ghommie-cit732
...
'mob_run_block' and 'mob_check_block' macros
2020-05-10 18:25:16 +00:00
300331ccb7
Skill modifiers datum WIP.
2020-05-10 02:11:48 +02:00
88d86e53d0
Porting some radial menu updates, and that one clown mask.
2020-05-09 00:45:48 +02:00
ffd5dd9615
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732
2020-05-08 19:01:28 +02:00
a412e840f7
'mob_run_block' and 'mob_check_block' macros
2020-05-08 18:52:32 +02:00
73d958649e
Update item_attack.dm
2020-05-08 17:12:13 +02:00
60bdbfaf61
Merge conflicts, procs instead of macros, mood signals.
2020-05-08 02:12:41 +02:00
73144a4f92
Merge branch 'master' into typing_indicators
2020-05-07 09:04:44 -07:00
f034c7c536
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-05 17:38:43 -07:00
91d6faaf21
more obligatory changes.
2020-05-05 21:06:53 +02:00
81dde7debd
Obligatory.
2020-05-05 21:04:19 +02:00
001109cfcd
About ready.
2020-05-05 20:58:44 +02:00
791b05871f
Hey.
2020-05-05 05:24:40 +02:00
0adca2d9b8
Oh.
2020-05-05 04:45:43 +02:00
643ef48f0e
Macros, generic skill implementations.
2020-05-05 04:42:34 +02:00
c1cd4d104f
Replaces the pAI candidate button with a ghost roles button
2020-05-03 20:31:11 -07:00
f99d904dc7
ports /tg/station vis_flags related fixes ( #12064 )
...
* fixes
* Update layers_planes.dm
* kay
2020-05-01 21:14:04 +02:00
abb7f199df
tweaks
2020-04-24 23:39:08 -07:00
07dedea81a
Merge remote-tracking branch 'citadel/master' into typing_indicators
2020-04-24 22:49:54 -07:00
803efebf65
https://github.com/tgstation/tgstation/pull/49960 Port
2020-04-23 12:45:50 +03:00
67e0b95407
Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/
2020-04-23 12:36:42 +03:00
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
5a6a205b9d
Merge pull request #11868 from Arturlang/tackling_and_lunge
...
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
kevinz000