Commit Graph

118 Commits

Author SHA1 Message Date
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
DeltaFire ef9c90d512 embeds, unarmed and wounds 2021-11-16 20:26:38 +01:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
SandPoot 1c80169f22 Update shields.dm 2021-10-02 22:35:54 -03:00
SandPoot 95b814d47e Upload files 2021-10-02 22:29:01 -03:00
Artur 30016f38a8 compiles 2021-07-28 02:13:57 +03:00
silicons 1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons 275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
necromanceranne 2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
necromanceranne 84223c65f5 Adds the shield flags to the ratvaran shield, adds the remaining sprites for the kinetic/energy/holo shields 2021-03-26 07:07:48 +11:00
necromanceranne 79de55c58c First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately. 2021-03-25 09:07:52 +11:00
silicons 427919d147 whew 2021-03-20 13:57:48 -07:00
silicons 519c694252 removes combat mode effects 2021-02-28 00:44:56 -07:00
Letter N 021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons 97f373a199 whew 2020-09-19 16:17:26 -07:00
silicons 1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
silicons 3e2ab66afa Update shields.dm 2020-08-04 21:34:59 -07:00
silicons 42db990836 why am i doing this 2020-08-03 13:37:37 -07:00
silicons 813fd9b3e0 Update shields.dm 2020-07-17 09:00:02 -07:00
Lin 703d03453b Merge pull request #12651 from Citadel-Station-13/silicons-patch-9
lowers shield blocking stamcost/second 3.5 to 2.5
2020-07-04 14:16:06 -05:00
silicons 2039496739 groan 2020-06-30 03:05:15 -07:00
silicons 84f6efe683 Update shields.dm 2020-06-29 23:22:48 -07:00
kevinz000 92d1af5889 adjustments 2020-06-04 22:18:19 -07:00
kevinz000 bad809ffce fixes 2020-06-04 19:56:06 -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 433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -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
kevinz000 52ea19da84 adjustment 2020-05-27 00:33:09 -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
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
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
kevinz000 f02e8da23a blockdirs 2020-05-07 08:54:21 -07:00
kevinz000 1c389abea6 hm 2020-05-07 05:39:17 -07:00
kevinz000 f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07: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