silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
DeltaFire
c7a098da06
suffering (aka, a bunch of fixes)
2021-06-21 19:05:31 +02:00
Artur
5619b73e6b
Makes it actually, actually work
2021-06-16 02:02:28 +03:00
Artur
724b34f55d
https://github.com/tgstation/tgstation/pull/54710
2021-06-16 00:44:32 +03:00
silicons
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -07:00
silicons
5e4f3ed694
Merge pull request #14683 from keronshb/shovedisarmgun
...
Off Balance Disarms only if shoved into a wall or person.
2021-06-09 12:14:37 -07:00
silicons
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
DeltaFire
b2e2c49011
plasmamen & golems
2021-06-02 17:47:57 +02:00
DeltaFire
0f01a4a7da
huh
2021-06-01 22:52:39 +02:00
DeltaFire
dd33371a3b
colors
2021-06-01 22:48:57 +02:00
silicons
eba3f554bc
Merge pull request #14737 from zeroisthebiggay/KILL
...
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
2021-05-23 08:52:25 -06:00
silicons
92e019dd56
Merge pull request #14716 from Putnam3145/fix-blacklisting-traits
...
Makes species/antag trait blacklist no longer remove ALL traits
2021-05-22 03:41:57 -06:00
Lin
0c77834c56
Merge pull request #14733 from qweq12yt/misc-fixes
...
[Fix] Even More bug fixing
2021-05-19 14:49:00 -05:00
zerothebigboy
bc61ada440
KILL
2021-05-19 13:24:40 -04:00
Putnam
030361e1cc
suggestions
2021-05-18 16:18:57 -07:00
qweq12yt
9dd372ed11
fix void cloak going to the void
2021-05-17 17:33:23 -03:00
timothyteakettle
34869215e8
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-14 01:59:32 +01:00
Putnam
1a92973d99
Antag/species quirk blacklist fix
2021-05-12 10:18:52 -07:00
silicons
2d455e4da2
Merge pull request #14710 from Linzolle/anthro
...
Anthromorphic isnt a word
2021-05-12 04:42:28 -06:00
Linzolle
4609d732f9
more spellcheck of anthropomorph
2021-05-10 17:15:43 -05:00
Lin
59914250c3
spellcheck
2021-05-10 17:04:48 -05:00
qweq12yt
8c0911e968
fix hulks breaking cuffs/zipties
2021-05-10 15:56:50 -03:00
Timothy Teakettle
be9b1ddffb
fixes
2021-05-10 14:43:45 +01:00
keronshb
cda492c6ba
Removes the condition if they're knocked down
2021-05-09 20:10:38 -04:00
silicons
633591b81e
Merge pull request #14688 from SandPoot/good-tooltips
...
Makes tooltips good and creates a base for adding more.
2021-05-07 18:41:22 -06:00
Timothy Teakettle
5bc33c222a
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-08 01:28:23 +01:00
keronshb
7947258e51
Off balance disarm
...
If it hits a wall or a person while under the effect of off balance.
2021-05-05 23:57:01 -04:00
SandPoot
9cf04467a7
upload files
2021-05-05 17:55:30 -03:00
Timothy Teakettle
ba71bb944a
im not crazy but this commit breaks 90% of the game
2021-05-05 18:11:05 +01:00
keronshb
be2e962983
Off Balance for Guns only again
...
Was intended for guns
2021-05-04 00:51:16 -04:00
Timothy Teakettle
93254f5d9c
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-02 22:20:57 +01:00
Timothy Teakettle
ac504d679b
digi humans
2021-04-30 14:07:44 +01:00
silicons
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
Timothy Teakettle
f243c6b7c4
makes them apply properly
2021-04-25 13:23:16 +01:00
Timothy Teakettle
869124bb50
markings
2021-04-24 15:56:57 +01:00
SandPoot
5bb6078def
upload files
2021-04-22 20:39:21 -03:00
silicons
f0c2188c5f
Merge pull request #14443 from necromanceranne/baton_change_pr
...
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
2021-04-20 05:52:59 -06:00
silicons
74280ed082
Merge pull request #14582 from BlueWildrose/slimeorgans
...
Slimeperson organs are now unique with a unique name, therefore confusing people
2021-04-18 19:02:53 -06:00
necromanceranne
75e0e893a2
Merge branch 'master' into baton_change_pr
2021-04-19 10:55:33 +10:00
Putnam
4811216f07
Activity tracking; traitor class tweaks
2021-04-13 06:42:32 -07:00
silicons
f998efa7bc
Merge pull request #14551 from BlueWildrose/ThePuddler2
...
This was going to just be a fix for slime puddles making mutation and cult visual indicators disappear but it ended up becoming more complicated than I thought
2021-04-08 03:23:57 -06:00
silicons
bda9f2ac76
Merge pull request #14540 from SandPoot/fixing-lizzies
...
Fixes some lizards
2021-04-08 03:22:46 -06:00
Blue Wildrose
cd81345e9f
Polishing up the new slimeperson organs also WHY IS THE SLIMEBRAIN SPRITE GONE
2021-04-07 15:00:09 -07:00
Blue Wildrose
3cf25a8cc7
Slimeperson organs are now more confusing
2021-04-06 23:10:23 -07:00
Blue Wildrose
1dac10b1ec
Might as well have it show halo stuff while puddling too
2021-04-01 04:43:18 -07:00
Blue Wildrose
b363cdd5ca
fixes puddles, cultism checks, spellchecks
2021-04-01 04:29:35 -07:00
SandPoot
df4779dced
upload files
2021-03-29 22:26:34 -03: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
LetterN
e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
Lin
79beaa97eb
Merge pull request #14481 from BlueWildrose/ewwghostpuddles
...
Nightmares' light eater can now destroy messes that emit light
2021-03-23 16:33:59 -05:00
