Commit Graph

6250 Commits

Author SHA1 Message Date
kevinz000
250d078596 that was easy 2020-05-30 23:14:02 -07:00
kevinz000
34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000
d832cb6526 fix 2020-05-30 22:43:23 -07:00
kevinz000
2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
kevinz000
1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00
kevinz000
c613726c2a render 2020-05-30 22:05:19 -07:00
kevinz000
e6020ca22c variable render 2020-05-30 21:02:13 -07:00
kevinz000
0723399ed4 render 2020-05-30 20:55:33 -07:00
kevinz000
d47841ee54 documentation 2020-05-30 20:38:07 -07:00
kevinz000
e5c32c1746 changes 2020-05-30 20:11:18 -07:00
Ghommie
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
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
kevinz000
3251338d31 fix 2020-05-30 02:01:06 -07:00
kevinz000
519552cb78 more handling 2020-05-30 01:59:58 -07:00
kevinz000
1214c99a34 is this a good idea 2020-05-30 01:46:43 -07:00
kevinz000
b74d465b6c fix 2020-05-30 01:22:09 -07:00
kevinz000
6b0b20b171 infinite loop protection 2020-05-30 01:00:41 -07:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
kevinz000
f63bc2e2d3 flags 2020-05-30 00:42:41 -07:00
kevinz000
ae9fc5789d adds more support to stuff 2020-05-30 00:35:17 -07:00
kevinz000
517cd26ed3 Delete living_combat.dm 2020-05-29 19:19:49 -07:00
kevinz000
65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -07:00
kevinz000
92a537da63 Damage fix 2020-05-29 19:12:46 -07:00
kevinz000
a8c0681e99 parrying works 2020-05-29 18:58:02 -07:00
kevinz000
8630c1481a effect text 2020-05-29 18:57:03 -07:00
kevinz000
809de27ffe yanderedev 2020-05-29 18:47:58 -07:00
Ghommie
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
Rohesie
5ab8d41d9a horns (#12384) 2020-05-30 03:25:27 +02:00
kevinz000
1f337ac65e itnerrupt 2020-05-29 18:03:04 -07:00
kevinz000
c9f651b6bd fix 2020-05-29 18:00:35 -07:00
kevinz000
09770891a0 fix 2020-05-29 17:53:29 -07:00
kevinz000
14706a98f4 fixes 2020-05-29 17:48:58 -07:00
Ghom
668205c149 Unstucks robot mobs from permanent sprint mode. (#12389) 2020-05-29 14:56:19 -07:00
Ghommie
a7934f3f88 event. 2020-05-29 18:58:34 +02:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
kevinz000
18bef15afc captain rapier 2020-05-29 02:36:13 -07:00
Ghommie
d4083aef33 casing. 2020-05-28 14:44:29 +02:00
Ghommie
295b366da4 Slight boss simple mob improvements. 2020-05-28 14:42:34 +02:00
Putnam3145
811b801569 fixes ghost role eligibility delay (#12379) 2020-05-28 14:11:42 +02:00
kevinz000
03ee37bb06 let's finish parrying 2020-05-28 04:55:43 -07:00
kevinz000
c19e00f6c3 fixes 2020-05-27 21:15:29 -07:00
kevinz000
f326c06324 fixEs 2020-05-27 21:07:07 -07:00
kevinz000
162e79df23 fixes dreamchecker errors 2020-05-27 18:17:00 -07:00
kevinz000
433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
Ghom
16dea7ceed Revamped the paper wizard robes. (#12348)
* Better paper wizard robes.

* return value.

* ooo

* Aaa

* aaaa
2020-05-27 18:01:22 -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
Lin
54bd506184 Merge pull request #12361 from Ghommie/Ghommie-cit794
Fixing some blindness stuff and visible messages.
2020-05-27 22:39:55 +00:00
Artur
3c973816d1 Ports https://github.com/tgstation/tgstation/pull/51125/ 2020-05-27 12:48:25 +03:00
kevinz000
52ea19da84 adjustment 2020-05-27 00:33:09 -07:00