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 |
|
kevinz000
|
1c064e9b5a
|
appearance
|
2020-05-27 00:12:44 -07:00 |
|
kevinz000
|
dc3f02dbfb
|
let's make it pretty
|
2020-05-27 00:08:00 -07:00 |
|
kevinz000
|
88476273fd
|
almost ready
|
2020-05-26 23:46:15 -07:00 |
|
Ghom
|
85186a9714
|
Porting updates related to material datums. (#12317)
* Porting updates related to material datums.
* art_type
* oh oh
|
2020-05-25 14:21:00 -07:00 |
|
Ghom
|
e11908a357
|
Oranges and Paperwork can be picked up again. (#12351)
|
2020-05-25 14:20:10 -07:00 |
|
Ghommie
|
841bb86181
|
Fixing blindness stuff.
|
2020-05-25 16:10:25 +02:00 |
|
kevinz000
|
be02287dca
|
category + compile
|
2020-05-24 15:21:52 -07:00 |
|
kevinz000
|
e4eb49050c
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-24 15:03:06 -07:00 |
|
kevinz000
|
95c6c7345c
|
implementations
|
2020-05-24 14:56:01 -07:00 |
|
Lin
|
ad57647e64
|
Merge pull request #12173 from kevinz000/projectiles_2
Refactors projectile speed to pixels per second
|
2020-05-24 21:21:41 +00:00 |
|
Ghom
|
9fef1b62e1
|
Removing duplicate total item attack force modifiers. (#12342)
|
2020-05-24 13:12:44 -07:00 |
|
Ghom
|
ce1f1bdf5e
|
Turning a few components into elements. (#12325)
* Turning a few components into elements.
* eh
|
2020-05-24 13:06:27 -07:00 |
|
Ghom
|
ab5d65a454
|
Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
|
2020-05-24 13:05:15 -07:00 |
|
Ghommie
|
a84e7bcecc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-05-24 04:00:51 +02:00 |
|
Lin
|
c857dc9cd1
|
Merge pull request #12321 from Ghommie/Ghommie-cit779
Makes fermichem properly logged in the reagents logs, tiny astrogen fix.
|
2020-05-22 21:36:00 +00:00 |
|