Commit Graph

80 Commits

Author SHA1 Message Date
Ghom
968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -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
DeltaFire15
30f296b2c7 Clockies now can summon shields to bash nonbelievers into orbit. (#12252)
* Shield time

Adds a shield for clockies which empowers bashes via the damage it blocks. Might or might not compile yet. Icons going to be added in the next commit because I'd rather not have to revert all instead of just the icons if I do a fucky

* Icon time

Adds the icons for the clockie shield. Just the implementation + icons as of now, no way to get it. Might still not compile 😳

* Compilation issue resolution

Now it compiles. So it works. Maybe.

* Little change

Only harm-intent bashes amplify the bash / use energy.

* Fixes up shield.dms repeair proc and moves the brass shield repair there

Oh cool time to throw in a fix aswell, neat!

* Some tweaks

Buffs the shields armor and integrity since it was VERY easy to break with energy before, now its medium against those and very strong against ballistics. also a bit easier to accumulate charge because its ''only'' 50% block

* Some more stuff for the shield

Adds a spell to summon the shield (20dc time, 600kw cost, tier-two spell)
aswell as adding some ''fun'' for non-clockie users of the shield.

* typo man bad

* more spellchecking

* even more little tweaks

* clarification on a comment

* sound tweak

only plays a special sound if its an empowered bash

* final tweakies before PR

* Abuse safeguard

Yeeah might be best to not allow clockies to bash eachother for infinite charge.

* another typo fix

I really shouldn't have been coding stuff for this at 5 am...

* Safeguards for a VERY specific edge case

Would have caused some weird behavious for edge cases if not resetting the values, so I'm doing it to be sure.

* 5am code bad

same thing like the previous commit but not unreachable because of return statements.

* Applying requested changes / suggestions proposed by Ghommie

Early return statement done by the harmful / servant check, other returns / simillar done via . = ..()

* Formatting
2020-05-18 14:47:44 +02:00
Ghom
8bad031979 Update shields.dm 2020-05-02 01:01:14 +02:00
kevinz000
5c20bde9f0 Update shields.dm 2020-04-25 20:58:22 -07:00
Ghom
5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness
Cybernetic arm implant balance pass (namely: shields)
2020-04-25 02:47:28 +02:00
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
fe63eca817 kay 2020-04-22 11:04:01 -07:00
kevinz000
3626cc5d28 okay 2020-04-22 10:50:03 -07:00
kevinz000
467497af54 woops 2020-04-22 10:45:13 -07:00
kevinz000
3e09ee8328 Alright 2020-04-22 10:42:11 -07: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