Artur
66979e2364
Merge branch 'master' into revenant_TK
2021-01-20 18:27:11 +02:00
Artur
16e0b85b44
More funshit
2021-01-20 18:23:28 +02:00
Artur
3737c52df8
Funny actions
2021-01-20 15:23:34 +02:00
silicons
9ddb3dc5d9
fix
2021-01-13 16:22:43 -07:00
Artur
2f619ffc4e
Traits
2021-01-13 10:27:10 +02:00
Artur
d5e99e9cef
TESTING
2021-01-13 05:56:10 +02:00
Letter N
56fb81d02c
Immursive Audio 2
2020-12-24 11:06:49 +08:00
silicons
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
silicons
1ea0dd9f76
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-19 15:56:13 -07:00
Hatterhat
0db189333a
>one fucking callback
2020-08-30 21:21:27 -05:00
silicons
de3227e3e0
fix
2020-08-04 22:55:33 -07:00
silicons
0a36f9fbb5
changes
2020-08-04 22:40:28 -07:00
Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
silicons
b0f03eac12
ok
2020-07-27 21:06:03 -07:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
silicons
703afec454
ok
2020-07-23 08:57:15 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
silicons
0b98b0409b
sigh
2020-07-18 18:29:09 -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
silicons
c10350f10e
Merge pull request #12677 from Ghommie/Ghommie-cit830
...
Fixes items' skills list keys missing associated traits and improves modulability a little.
2020-07-04 00:12:37 -07:00
Ghommie
bde80eb1fb
Fixing obscured inventory slots (un)equip block, for real.
2020-07-03 19:02:20 +02:00
Ghommie
f5ffd7d2a9
Easing fine tuning of the system.
2020-07-03 03:00:33 +02:00
Ghommie
396989f143
Fixes items' used skills list keys missing associated base traits.
2020-07-03 01:52:03 +02:00
silicons
3f1119fcdb
Merge pull request #12630 from Ghommie/Ghommie-cit822
...
You can't (un)equip garments on/from obscured inventory slots anymore.
2020-07-02 01:44:59 -07:00
Ghommie
a34a7ba5d4
You can't (un)equip garments on/from obscured inventory slots anymore.
2020-06-28 01:10:22 +02:00
Ghommie
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
Ghommie
29a8d2ed78
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813
2020-06-20 00:07:47 +02:00
Timothy Teakettle
7fbfb4ad0e
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01:00
Timothy Teakettle
34c9a2f821
part 4
2020-06-11 21:45:32 +01:00
Timothy Teakettle
91d61c8560
part 3
2020-06-11 21:30:55 +01:00
Timothy Teakettle
38bf529f3c
a tonne of fixes
2020-06-11 20:18:36 +01:00
Timothy Teakettle
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
Timothy Teakettle
8ec5672b85
tonne of fixes
2020-06-10 21:14:08 +01:00
Timothy Teakettle
95b8cd3956
first port
2020-06-10 20:33:01 +01:00
kevinz000
1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -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
2232271ea5
fixes and render
2020-05-30 22:29:41 -07:00
kevinz000
433bd1af79
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-27 18:11:15 -07:00
Ghom
968426fd48
Combat mode component. ( #12338 )
...
* Combat mode component.
* Whoops.
* test.
* Oh
* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
Rohesie
d88c815845
vars ( #12373 )
2020-05-28 01:18:26 +02:00
kevinz000
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
Ghom
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
kevinz000
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
Ghommie
300331ccb7
Skill modifiers datum WIP.
2020-05-10 02:11:48 +02:00
Ghommie
3dfef3c393
.
2020-05-08 02:50:14 +02:00
Ghommie
60bdbfaf61
Merge conflicts, procs instead of macros, mood signals.
2020-05-08 02:12:41 +02:00
kevinz000
f034c7c536
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-05 17:38:43 -07:00
Ghommie
001109cfcd
About ready.
2020-05-05 20:58:44 +02:00
