Commit Graph

85 Commits

Author SHA1 Message Date
kevinz000
c2822dd885 Update stunbaton.dm 2020-03-06 07:23:29 -07:00
kevinz000
0afaf6794c Update stunbaton.dm 2020-03-06 07:21:52 -07:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
kevinz000
938d87cfba Update stunbaton.dm 2020-02-15 17:28:04 -07:00
kevinz000
7eb93a1fa8 Update stunbaton.dm 2020-02-15 15:36:08 -07:00
kevinz000
e8ccf4b6d7 fix 2020-02-13 16:25:43 -07:00
kevinz000
b3a81d9c8e ok 2020-02-13 15:59:58 -07:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Tupinambis
3539fa7603 Stunbaton PR had bad math didn't properly reduce effectiveness oops. 2020-02-05 00:31:54 -06:00
Tupinambis
5f58173038 I kinda completely fucked my original stunbaton PR. This is just a rePR of it. 2020-01-31 11:55:52 -06:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
Ghommie
9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kappa-sama
3e199ed780 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer 2020-01-12 14:23:38 -05:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kappa-sama
b6a187dc6d OOPS 2020-01-10 22:48:33 -05:00
kappa-sama
f88eefa8a9 stunsword 2020-01-10 22:30:28 -05:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
af0110db40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-11-27 21:16:20 +01:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie
bddb437872 It works now. 2019-11-18 18:30:46 +01:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
Ghommie
09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie
9cb1f2b9d9 Little stunbaton nerf (split off from #9500) 2019-10-18 18:37:15 +02:00
Ghommie
a3c2ed0b52 fixes. 2019-06-15 02:19:57 +02:00
Ghommie
e2bf5b73fd I'm being too careless, sorry for the many commits. 2019-06-12 23:22:31 +02:00
Ghommie
7a8eaf41ac another get_cell() 2019-06-12 23:21:42 +02:00
Ghommie
5ba46eb517 Avoid runtiming. 2019-06-12 23:20:34 +02:00
Ghommie
2edef99b08 . 2019-06-12 23:16:27 +02:00
Ghommie
a29095cbe1 Penitence for the awful mistakes I have done in the refactor. 2019-06-12 23:06:09 +02:00
Ghommie
5a35e95735 . 2019-06-12 22:52:05 +02:00
Ghommie
4cc7636da1 fixing more. 2019-06-12 22:50:09 +02:00
Ghommie
368267f53d dddddd 2019-06-12 20:31:24 +02:00
Ghommie
516b71ed7e fixing stunbatons. 2019-06-12 20:13:08 +02:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
kevinz000
68ef76e09a Merge pull request #8432 from Ghommie/Ghommie-cit15
Buffs stunprods to not have a cooldown
2019-06-08 01:03:01 -07:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie
6be3496d36 Merge branch 'Ghommie-cit15' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit15 2019-06-02 22:50:02 +02:00
Ghommie
a0898a779a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit15 2019-06-02 22:48:38 +02:00
Ghommie
ae5d68c6f9 Fixes stunbatons' icons not properly updating on cell removal, and more cell charge leniency. 2019-06-02 13:24:03 +02:00
Ghommie
37aa491fa5 removes emp downtime, Kev's request. 2019-05-27 02:30:03 +02:00