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 |
|
CuteMoff
|
dd295d20c2
|
Merge branch 'master' into Plasmaispogtake2
|
2021-03-25 10:44:12 -04:00 |
|
CuteMoff
|
3efce37fd9
|
Update mineral.dm
|
2021-03-25 10:32:13 -04:00 |
|
keronshb
|
b06c15ab30
|
Update traitordevices.dm
Fixed
|
2021-03-24 21:32:31 -04:00 |
|
necromanceranne
|
45340ef1ac
|
Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed.
|
2021-03-25 09:27:33 +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 |
|
LetterN
|
e3fb2d5491
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-24 21:55:47 +08:00 |
|
CuteMoff
|
ea200acd9f
|
Update code/game/objects/items/stacks/sheets/mineral.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
|
2021-03-23 23:17:24 -04:00 |
|
CuteMoff
|
a51a1ae68f
|
Update mineral.dm
|
2021-03-23 21:24:11 -04:00 |
|
CuteMoff
|
048b8548ad
|
Update mineral.dm
|
2021-03-23 20:53:07 -04:00 |
|
CuteMoff
|
428591c452
|
Update mineral.dm
|
2021-03-23 20:36:48 -04:00 |
|
silicons
|
5910950a49
|
Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
|
2021-03-22 21:15:14 -06:00 |
|
LetterN
|
760a7de229
|
Merge remote-tracking branch 'origin/master' into fixes-2
|
2021-03-22 09:32:21 +08:00 |
|
Putnam
|
f1e55f2df0
|
Paranoid updates to maybe fix air duplication
|
2021-03-20 22:02:47 -07:00 |
|
keronshb
|
0b5cedf893
|
patches out a radioactive microlaser tech, makes radioactive microlasers not knock out rad-immune creatures (#57380)
|
2021-03-20 20:40:51 -04:00 |
|
silicons
|
1fd06a89b7
|
Oh Boy
|
2021-03-20 16:27:52 -07:00 |
|
silicons
|
02b52e6142
|
framework
|
2021-03-20 16:02:26 -07:00 |
|
silicons
|
efa4139aff
|
math fix
|
2021-03-20 14:17:13 -07:00 |
|
silicons
|
5b2a42f254
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-20 14:13:23 -07:00 |
|
silicons
|
427919d147
|
whew
|
2021-03-20 13:57:48 -07:00 |
|
silicons
|
604a6efeca
|
baton change
|
2021-03-20 13:45:39 -07:00 |
|
silicons
|
15dd80a085
|
less awful
|
2021-03-20 13:39:59 -07:00 |
|
silicons
|
a1c4323653
|
Merge pull request #14457 from GrayRachnid/holopads
Fixes the bug that allows anybody(other than heads) to auto-call holopads and adds secure holopads.
|
2021-03-20 14:28:07 -06:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
necromanceranne
|
6a752cfd5d
|
Not quite right
|
2021-03-20 04:28:20 +11:00 |
|
necromanceranne
|
a61ac1fc68
|
Applies off balance on right click, allowing you to shove a weapon out of someones hands
|
2021-03-20 04:23:23 +11:00 |
|
LetterN
|
150f6f4328
|
cbt
|
2021-03-19 20:11:26 +08:00 |
|
ItzGabby
|
ea1cf6797e
|
I'm literally going to die with these checks
|
2021-03-19 02:59:30 -04:00 |
|
ItzGabby
|
68bf156091
|
Merge branch 'master' into bark-box
|
2021-03-19 02:48:31 -04:00 |
|
ItzGabby
|
4a49f6eebe
|
barked on
|
2021-03-19 01:38:17 -04:00 |
|
LetterN
|
2c2e779aa6
|
Merge remote-tracking branch 'origin/master' into fixes-2
|
2021-03-19 10:28:43 +08:00 |
|
silicons
|
1f58e1823e
|
Update bodybag.dm
|
2021-03-18 17:00:16 -07:00 |
|
silicons
|
8c97297a47
|
Merge pull request #14444 from DeltaFire15/jar-removal
Locks Bluespace Jars to be admin-only
|
2021-03-18 06:41:38 -06:00 |
|
GrayRachnid
|
b4969c4770
|
Fixes auto-calling for non-heads and adds secure holopads
|
2021-03-17 12:40:25 -04:00 |
|
DeltaFire
|
45c3f2b222
|
Merge pull request #14406 from Hatterhat/hypoprints
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
|
2021-03-17 17:01:47 +01:00 |
|
LetterN
|
69982f6315
|
fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452
and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450
|
2021-03-17 11:49:50 +08:00 |
|
YakumoChen
|
3aca657c1f
|
Update uplink_kits.dm
|
2021-03-16 22:03:49 -04:00 |
|
YakumoChen
|
5f30c71321
|
Update uplink_kits.dm
|
2021-03-16 22:00:44 -04:00 |
|
LetterN
|
228105b391
|
laptop and closet decon fix
|
2021-03-16 14:47:28 +08:00 |
|
YakumoChen
|
757e7b34d7
|
Update code/game/objects/items/storage/uplink_kits.dm
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
|
2021-03-16 00:57:56 +00:00 |
|
DeltaFire
|
2d43fd06e8
|
qdel
|
2021-03-15 23:14:29 +01:00 |
|
silicons
|
5d51025ad6
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-15 14:39:16 -07:00 |
|
DeltaFire
|
f99c17012c
|
removes jars from techweb
|
2021-03-15 22:26:05 +01:00 |
|
necromanceranne
|
1de69e0dec
|
uuuuh if you say so boss
|
2021-03-16 06:14:49 +11:00 |
|
necromanceranne
|
832fb7a6f8
|
oops, this should fix that failed check...I hope
|
2021-03-16 06:03:22 +11:00 |
|
necromanceranne
|
29a28d4ed8
|
keeps knockdown on rng throw, because you deserve it if you land it
|
2021-03-16 05:52:38 +11:00 |
|
necromanceranne
|
6ebc911937
|
Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge.
|
2021-03-16 04:48:55 +11:00 |
|
silicons
|
5472186bc2
|
Merge pull request #14398 from LetterN/post-hardsync1.5
post-hardsync1.5
|
2021-03-14 23:30:26 -06:00 |
|
YakumoChen
|
8484f2f120
|
adds ancient kit
|
2021-03-13 03:36:54 +00:00 |
|