Commit Graph

70 Commits

Author SHA1 Message Date
kevinz000
411622430f Merge pull request #11985 from Ghommie/Ghommie-cit701
Removal of backward 512 compatibility.
2020-04-22 18:40:41 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Trilbyspaceclone
511465ed7b Update shields.dm 2020-04-22 18:13:09 -04:00
kevinz000
3e9b1a6875 Update shields.dm 2020-04-20 14:02:39 -07:00
kevinz000
7e2a54d5d6 fix 2020-04-20 12:30:20 -07:00
kevinz000
6428f4a0c2 ok 2020-04-20 12:18:09 -07:00
kevinz000
90f6904f44 fix 2020-04-20 12:16:42 -07:00
Trilbyspaceclone
6fcec77e9b Update shields.dm 2020-04-19 23:18:17 -04:00
Trilbyspaceclone
d26ba86660 Update shields.dm 2020-04-17 23:30:58 -04:00
Trilbyspaceclone
7756a80beb Merge branch 'master' into shields! 2020-04-17 19:32:39 -04:00
Trilbyspaceclone
0f7bc55755 le sigh 2020-04-17 10:25:48 -04:00
Trilbyspaceclone
8d4782290c Update shields.dm 2020-04-17 10:25:20 -04:00
TrilbySpaceClone
4419dc13f5 changes and additons 2020-04-14 22:17:53 -04:00
kevinz000
6f5c1bac08 harmful 2020-04-11 08:37:53 -07:00
kevinz000
de296c8879 Merge branch 'shield_bashing' of github.com-kevinz000:kevinz000/Citadel-Station-13 into shield_bashing 2020-04-11 08:37:30 -07:00
kevinz000
bcf77458dd nicer way to bash people 2020-04-11 08:37:02 -07:00
kevinz000
ab1d7c29ad Update shields.dm 2020-04-11 08:28:02 -07:00
kevinz000
eacc783f09 k 2020-04-11 08:23:25 -07:00
kevinz000
b39eb60c4a shield bashing 2020-04-11 07:30:23 -07:00
kevinz000
f3537f38e6 shield bashing 2020-04-11 07:09:50 -07:00
kevinz000
3901049c0d Update shields.dm 2020-04-07 12:50:01 -07:00
kevinz000
229b6751ec nerf eshield 2020-03-16 13:47:44 -07:00
kevinz000
7fdbcc55c6 s 2020-03-16 11:12:10 -07:00
kevinz000
e3301f8722 bet 2020-03-16 10:44:02 -07:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
763c835a53 bitflags not equals 2020-03-16 04:26:19 -07:00
kevinz000
94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
kevinz000
d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000
703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000
5d2fb654e8 k 2020-03-16 03:23:09 -07:00
kevinz000
4d0677daa9 s 2020-03-14 21:48:23 -07:00
Trilbyspaceclone
5c2bf70fe7 Update code/game/objects/items/shields.dm
Co-Authored-By: Arturlang <arturpaavooskari.lang@gmail.com>
2020-03-01 00:48:45 -05:00
TrilbySpaceClone
c638a83e23 Merge branch 'master' into more_implants 2020-02-22 18:34:02 -05:00
Trilbyspaceclone
3fd93a3bad Update shields.dm 2020-02-22 17:57:36 -05:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Trilbyspaceclone
f6afa28ce0 Update shields.dm 2020-02-16 02:03:48 -05:00
Trilbyspaceclone
3fde58434f Merge branch 'master' into more_implants 2020-02-16 01:55:19 -05:00
TrilbySpaceClone
75844930b4 new implants! 2020-02-13 03:42:59 -05:00
Trilbyspaceclone
aa12ec70a3 Update shields.dm 2020-02-13 03:02:26 -05:00
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
Artur
5bf1ebaa53 Initial Commit 2020-02-03 12:01:17 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Trilbyspaceclone
22cb46cb22 Update shields.dm 2019-07-08 20:30:46 -04:00
Trilbyspaceclone
707da687e7 madness 2019-06-26 18:54:02 -04:00
Trilbyspaceclone
69ac1dfb6d icons 2019-06-26 18:52:34 -04:00
Trilbyspaceclone
b1617999fb Update shields.dm 2019-06-26 18:22:59 -04:00
Trilbyspaceclone
1d4f55cab2 makes tower shield be seeable 2019-06-22 13:34:08 -04:00
Trilbyspaceclone
5716ea7a4b Update shields.dm 2019-06-16 10:22:07 -04:00
Trilbyspaceclone
b8ddbb5008 Update shields.dm 2019-06-08 11:21:40 -04:00