 Lin
|
8379169b81
|
Merge pull request #11476 from kevinz000/shield_refactor
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
|
2020-04-07 20:47:15 +00:00 |
|
|
kevinz000
|
413ded02c0
|
Merge pull request #11433 from Ghommie/Ghommie-cit616
Spellcasting element
|
2020-04-03 16:31:10 -07:00 |
|
|
kevinz000
|
bf0970d8c3
|
Merge remote-tracking branch 'citadel/master' into shield_refactor
|
2020-03-23 15:34:04 -07:00 |
|
|
zeroisthebiggay
|
f5a96241ab
|
sneaksuits are not fireproof (#11573)
* and i wanna die
* i decide to revert
* a a a a
|
2020-03-23 15:47:41 +01:00 |
|
|
Ghommie
|
2045fb86f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
|
2020-03-21 21:41:34 +01:00 |
|
|
kevinz000
|
300c8e3c6d
|
Merge remote-tracking branch 'citadel/master' into shield_refactor
|
2020-03-21 09:53:39 -07:00 |
|
|
ZeroMan
|
35a4d71a54
|
im sorry little one
|
2020-03-19 21:59:14 -04: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
|
a77be038b8
|
refactoring this whole thing again
|
2020-03-16 04:56:32 -07:00 |
|
|
kevinz000
|
2a9e4bebdd
|
priority
|
2020-03-16 04:24:18 -07:00 |
|
|
kevinz000
|
69374c64c9
|
k
|
2020-03-16 04:18:22 -07:00 |
|
|
kevinz000
|
857f793600
|
ok
|
2020-03-16 04:12:54 -07:00 |
|
|
kevinz000
|
644273beca
|
k
|
2020-03-16 04:09:25 -07:00 |
|
|
Ghommie
|
312ef1d961
|
Merge branch 'Ghommie-cit616' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit616
|
2020-03-15 22:38:42 +01:00 |
|
|
Ghommie
|
ea30b2fb1a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
|
2020-03-15 22:35:59 +01:00 |
|
|
Ghom
|
bba13d706d
|
FAAAAKE
|
2020-03-12 00:16:42 +01:00 |
|
|
Ghommie
|
d31075eb54
|
Spellcasting element
|
2020-03-11 16:23:30 +01:00 |
|
|
Ghommie
|
27a7f754c4
|
Fix runtimes some more.
|
2020-03-10 22:40:06 +01:00 |
|
|
kevinz000
|
16d6ba9e21
|
Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
|
2020-03-06 00:17:21 -07:00 |
|
|
Ghommie
|
f2c8a7cd6f
|
Porting a couple material datums code updates and fixes.
|
2020-03-04 15:59:46 +01:00 |
|
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
|
Ghom
|
c984cd7677
|
Merge pull request #11270 from ancientpower/paramedic-tweaks
Paramedic tweaks (sprites/access/stuff for future use)
|
2020-03-02 22:46:49 +01:00 |
|
|
Trilbyspaceclone
|
cdd97e8547
|
she
|
2020-03-01 00:12:45 -05:00 |
|
|
Trilbyspaceclone
|
e2b706961a
|
Turns out this is Rag's PR and not mine
Neet
Co-Authored-By: Ragolution <bloodlust3333@gmail.com>
|
2020-03-01 00:11:32 -05:00 |
|
|
Trilbyspaceclone
|
3c9d592b8a
|
Update miscellaneous.dm
|
2020-02-29 09:51:40 -05:00 |
|
|
ancientpower
|
23c3e5b328
|
tweaks for the tweaks
|
2020-02-28 00:17:28 -06:00 |
|
|
ancientpower
|
12ba71f588
|
paramedic tweaks
|
2020-02-27 23:23:44 -06:00 |
|
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07: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 |
|
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
|
kevinz000
|
a5f06430e4
|
repulse armor sanity (#10949)
|
2020-02-16 07:36:50 +01:00 |
|
|
Trilbyspaceclone
|
661e01ca0c
|
Update miscellaneous.dm (#11094)
|
2020-02-15 19:12:19 +01:00 |
|
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
|
Ghommie
|
98a525568f
|
Ok.
|
2020-02-08 23:59:20 +01:00 |
|
|
Ghommie
|
3485d82dd0
|
salty digi man bad.
|
2020-02-08 23:58:05 +01:00 |
|
|
kevinz000
|
3f5805a9e8
|
Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
|
2020-02-06 23:52:49 -07:00 |
|
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
|
necromanceranne
|
43c4debb4f
|
Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits.
|
2020-01-31 11:54:18 +11:00 |
|
|
Seris02
|
dbb6218e0d
|
merp
|
2020-01-30 14:54:07 +08:00 |
|
|
Seris02
|
afb4bebf2d
|
merge conflicts
|
2020-01-30 12:47:48 +08:00 |
|
|
Seris02
|
beb90d39a6
|
polychromic winter coat
|
2020-01-30 12:44:40 +08:00 |
|
|
Lin
|
cde6601c60
|
Merge pull request #10759 from Ghommie/Ghommie-cit534
demodularize and removes lot of unused clothing with missing sprites.
|
2020-01-29 19:58:26 +00:00 |
|
|
Seris02
|
1a40bec44b
|
merge maybe fix
|
2020-01-29 18:45:21 +08:00 |
|
|
Seris02
|
e6f8f478d7
|
prototype
|
2020-01-29 18:43:15 +08:00 |
|
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
|
Ghommie
|
5875f2578c
|
demodularize and removes lot of unused clothing with missing sprites.
|
2020-01-28 02:32:46 +01:00 |
|