1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -07:00
937731d77d
fix and tested
2020-06-02 21:32:36 -04:00
b62ef0f4e8
right...
2020-06-02 19:44:47 -04:00
ab3799ae7a
Ports cornrows hairstyles from yogstation ( #12423 )
2020-06-02 15:29:07 -07:00
ea763df326
Photosynthesis element. ( #12394 )
...
* Photosynthesis element.
* element yaketi sax.
* Ok, let's just use SSobj which has 20 wait instead of 10.
2020-06-02 15:23:09 -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
348885a58d
Merge pull request #12382 from Ghommie/Ghommie-cit797
...
Slight simple mob boss improvements.
2020-05-31 15:22:23 +00:00
abc2b820a4
Update living_blocking_parrying.dm
2020-05-30 23:49:04 -07:00
5b6e797c4f
desword adjustments
2020-05-30 23:43:05 -07:00
250d078596
that was easy
2020-05-30 23:14:02 -07:00
34d8aa0ee9
refactor
2020-05-30 23:13:16 -07:00
d832cb6526
fix
2020-05-30 22:43:23 -07:00
2232271ea5
fixes and render
2020-05-30 22:29:41 -07:00
1fef5825a9
definition fixes
2020-05-30 22:09:13 -07:00
c613726c2a
render
2020-05-30 22:05:19 -07:00
e6020ca22c
variable render
2020-05-30 21:02:13 -07:00
0723399ed4
render
2020-05-30 20:55:33 -07:00
d47841ee54
documentation
2020-05-30 20:38:07 -07:00
e5c32c1746
changes
2020-05-30 20:11:18 -07:00
9a9e76664f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 22:47:13 +02:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
3251338d31
fix
2020-05-30 02:01:06 -07:00
519552cb78
more handling
2020-05-30 01:59:58 -07:00
1214c99a34
is this a good idea
2020-05-30 01:46:43 -07:00
b74d465b6c
fix
2020-05-30 01:22:09 -07:00
6b0b20b171
infinite loop protection
2020-05-30 01:00:41 -07:00
05fe0c7dcc
ok
2020-05-30 00:59:29 -07:00
f63bc2e2d3
flags
2020-05-30 00:42:41 -07:00
ae9fc5789d
adds more support to stuff
2020-05-30 00:35:17 -07:00
517cd26ed3
Delete living_combat.dm
2020-05-29 19:19:49 -07:00
65bb3bbb91
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-29 19:13:22 -07:00
92a537da63
Damage fix
2020-05-29 19:12:46 -07:00
a8c0681e99
parrying works
2020-05-29 18:58:02 -07:00
8630c1481a
effect text
2020-05-29 18:57:03 -07:00
809de27ffe
yanderedev
2020-05-29 18:47:58 -07:00
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
5ab8d41d9a
horns ( #12384 )
2020-05-30 03:25:27 +02:00
1f337ac65e
itnerrupt
2020-05-29 18:03:04 -07:00
c9f651b6bd
fix
2020-05-29 18:00:35 -07:00
09770891a0
fix
2020-05-29 17:53:29 -07:00
14706a98f4
fixes
2020-05-29 17:48:58 -07:00
668205c149
Unstucks robot mobs from permanent sprint mode. ( #12389 )
2020-05-29 14:56:19 -07:00
a7934f3f88
event.
2020-05-29 18:58:34 +02:00
e51ac4e745
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-05-29 17:58:35 +02:00
18bef15afc
captain rapier
2020-05-29 02:36:13 -07:00
d4083aef33
casing.
2020-05-28 14:44:29 +02:00
295b366da4
Slight boss simple mob improvements.
2020-05-28 14:42:34 +02:00
811b801569
fixes ghost role eligibility delay ( #12379 )
2020-05-28 14:11:42 +02:00
03ee37bb06
let's finish parrying
2020-05-28 04:55:43 -07:00
c19e00f6c3
fixes
2020-05-27 21:15:29 -07:00
kevinz000