keronshb
70926f5daf
Merge remote-tracking branch 'upstream/master' into floorcluwneport
2021-05-31 22:21:34 -04:00
silicons
cb52be5dd9
fixes linter warnings ( #14778 )
...
* woo
* woo
2021-05-31 10:19:20 -05:00
silicons
caa2dbeefd
Update slaughter.dm
2021-05-28 05:51:21 -07:00
silicons
7c1b8ee07d
Merge pull request #14757 from Kraseo/no-bloodcrawlies
...
fixes being able to slam into people while bloodcrawled as slaughter demon
2021-05-28 06:50:19 -06:00
keronshb
e0a1e50927
Fixes the linter
2021-05-27 13:25:27 -04:00
keronshb
8f1db2d5ec
Fixes some stuff
...
Actually ticks the spell, fixes the brain damage issue, etc.
2021-05-27 12:16:54 -04:00
Kraseo
c3bfbac89a
this time for real
2021-05-26 01:43:45 +02:00
Kraseo
7173bfade5
this is why i don't do webedits
2021-05-26 00:35:49 +02:00
Kraseo
3b5f391843
Merge branch 'master' into no-bloodcrawlies
2021-05-26 00:29:20 +02:00
Kraseo
7e2e608784
fixes slamming people into walls and such while bloodcrawled
...
no
2021-05-26 00:23:11 +02:00
zerothebigboy
36fe3fef76
abuse
2021-05-24 21:40:15 -04: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
67ea47998c
Merge pull request #14738 from Putnam3145/fix-activity-again
...
Makes antags actually get activity properly
2021-05-20 13:33:51 -05:00
Lin
0c77834c56
Merge pull request #14733 from qweq12yt/misc-fixes
...
[Fix] Even More bug fixing
2021-05-19 14:49:00 -05:00
Putnam
fc31453587
Makes antags actually get activity properly
2021-05-18 16:27:07 -07: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
Putnam
1a92973d99
Antag/species quirk blacklist fix
2021-05-12 10:18:52 -07:00
silicons
5601badbff
deterministic explosion system ( #13392 )
...
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
2021-05-12 05:44:53 -05:00
silicons
c5f13c44a8
Merge pull request #14708 from qweq12yt/misc-fixes
...
[Fix] Bugs are BAD!
2021-05-12 04:42:22 -06:00
Lin
82b6443928
Merge pull request #14700 from keronshb/skewerpain
...
What if failing to remove a brass skewer caused *pain?
2021-05-11 14:11:07 -05:00
qweq12yt
3b234405c8
fixed disky comfort spam
2021-05-10 16:06:57 -03:00
DeltaFire
0c0e5f6d18
fixes
2021-05-10 17:44:21 +02:00
keronshb
1804b7ba63
Skewer Pain
...
Replaces ouchie with *pain
2021-05-08 19:35:55 -04:00
silicons
cb87f798c3
Merge pull request #14631 from keronshb/slaughtereventlower
...
Kev please don't kill me for a one number change but this lowers Slaughter Demon Weight
2021-04-18 19:13:24 -06:00
keronshb
c872055821
Lowers demons weight
...
Bit too hjgh
2021-04-18 21:03:54 -04:00
silicons
e8e625cb5c
Merge pull request #14603 from Putnam3145/fix-base-option
...
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
silicons
791f2bb746
Merge pull request #14592 from zeroisthebiggay/patch-8
...
ports "Allow Revenants to read deadchat" from TG
2021-04-18 18:48:01 -06:00
Putnam
4811216f07
Activity tracking; traitor class tweaks
2021-04-13 06:42:32 -07:00
Blue Wildrose
4f426f071f
Revenant changes port from TG
2021-04-10 19:04:06 -07:00
zeroisthebiggay
dccdb6cf56
Update revenant.dm
2021-04-08 20:05:03 -04: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
Blue Wildrose
b363cdd5ca
fixes puddles, cultism checks, spellchecks
2021-04-01 04:29:35 -07:00
LetterN
f976a89157
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-31 08:19:31 +08:00
silicons
ebacd30cb5
Merge pull request #14440 from Putnam3145/slaughter-demon-thing
...
Made slaughter demon have higher weight if there's more blood
2021-03-27 01:38:07 -06:00
silicons
1f91d8efe3
Merge pull request #14522 from Hatterhat/rusted-hills-bruh
...
calling upon the Rusted Hills no longer pokes at bluespace
2021-03-27 01:36:49 -06:00
silicons
bf382f490c
Merge pull request #14518 from necromanceranne/shield_explodies_fix
...
Shields: Changes, additional flags, bug fixes, sprites
2021-03-27 01:31:55 -06:00
Hatterhat
c56c730c56
bruh
2021-03-25 23:56:01 -05:00
Hatterhat
c8249c47cd
uhh that's kinda fucked up bossman
2021-03-25 22:34:54 -05: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
Putnam
7190ef5d62
why did i do it that way?
2021-03-24 18:25:12 -07:00
Putnam
18ce504f06
oh and this should not go up infinitely
2021-03-24 17:24:13 -07:00
Putnam
254187bc2e
it's not a global proc
2021-03-24 17:23:21 -07:00
LetterN
e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
DeltaFire
086bb75006
Merge pull request #14483 from zeroisthebiggay/patch-6
...
makes strained muscles slightly less absurd by adding a proper chemical slowdown
2021-03-24 06:47:45 +01:00
zeroisthebiggay
513b98f3e0
Update strained_muscles.dm
2021-03-23 20:28:46 -04:00
Lin
b7f8deaf38
Merge pull request #14484 from zeroisthebiggay/cumbranch
...
biodegrade works on legcuffs
2021-03-23 16:22:26 -05:00
zeroisthebiggay
b292fcb1dd
Update strained_muscles.dm
2021-03-20 19:52:39 -04:00
zeroisthebiggay
f4b3d7274c
Update strained_muscles.dm
2021-03-20 19:50:13 -04:00
zeroisthebiggay
bc3a2e19b2
Update strained_muscles.dm
2021-03-20 19:44:41 -04:00
