Merge branch 'freedoom:master' into ssgfix

This commit is contained in:
mc776 2023-03-15 12:00:18 -07:00 committed by GitHub
commit 2612b21dbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 72 additions and 90 deletions

View file

@ -260,7 +260,7 @@ CC_HELL = pain bringer
CC_BARON = pain lord
CC_ARACH = technospider
CC_PAIN = matribite
CC_REVEN = dark soldier
CC_REVEN = octaminator
CC_MANCU = combat slug
CC_ARCH = necromancer
CC_SPIDER = large technospider
@ -611,10 +611,10 @@ OB_STEALTHDEMON=%o thought %g saw a flesh worm.
OB_STEALTHKNIGHT=%o thought %g saw a pain bringer.
OB_STEALTHIMP=%o thought %g saw a serpentipede.
OB_STEALTHFATSO=%o thought %g saw a combat slug.
OB_STEALTHUNDEAD=%o thought %g saw a dark soldier.
OB_STEALTHUNDEAD=%o thought %g saw an octaminator.
OB_STEALTHSHOTGUY=%o thought %g saw a shotgun zombie.
OB_STEALTHZOMBIE=%o thought %g saw a zombie.
OB_UNDEADHIT=%o was punched by a dark soldier.
OB_UNDEADHIT=%o was punched by an octaminator.
OB_IMPHIT=%o was slashed by a serpentipede.
OB_CACOHIT=%o got too close to a trilobite.
OB_DEMONHIT=%o was bitten by a flesh worm.
@ -624,7 +624,7 @@ OB_KNIGHTHIT=%o was gutted by a pain bringer.
OB_ZOMBIE=%o was killed by a zombie.
OB_SHOTGUY=%o was gunned down by a shotgun zombie.
OB_VILE=%o was incinerated by a necromancer.
OB_UNDEAD=%o couldn't evade the dark soldier's fireball.
OB_UNDEAD=%o couldn't evade an octaminator's fireball.
OB_FATSO=%o was blasted by a combat slug.
OB_CHAINGUY=%o was perforated by a minigun zombie.
OB_SKULL=%o was slammed by a hatchling.

View file

@ -2328,9 +2328,9 @@ SUPPORT2 64 128
* SUPPORT2 0 0
* SUPPORT2 40 0
* SUPPORT2 20 0
* SUPPORT2 0 72
* SUPPORT2 20 72
* SUPPORT2 40 72
* SUPPORT2 0 64
* SUPPORT2 20 64
* SUPPORT2 40 64
SUPPORT3 64 128
* WALL42_3 20 0
* WALL42_3 0 0