Commit Graph

11976 Commits

Author SHA1 Message Date
Novacat 1ca5759a71 Merge pull request #9446 from Very-Soft/les-violent-cass
less violent cass
2020-12-12 07:00:18 +00:00
Razgriz 42de071189 Merge pull request #962 from CHOMPStationBot/upstream-merge-9406
[MIRROR] Implements negative trait "Neural hypersensitivity"
2020-12-08 02:02:28 -07:00
Nadyr 1191898927 Update negative.dm 2020-12-08 03:32:12 -05:00
Nadyr 2875dd109c Merge pull request #974 from Darlantanis/LiquidBelliesPort
Liquid Bellies TGUI Port
2020-12-08 03:06:32 -05:00
Nadyr 481f5d40b6 Merge pull request #967 from CHOMPStationBot/upstream-merge-9412
[MIRROR] Fixes proteans losing languages when un-blobbing
2020-12-08 03:02:35 -05:00
Razgriz 42ca8725c8 Merge pull request #959 from CHOMPStationBot/upstream-merge-9401
[MIRROR] Adds 2 new maintenance predators: Sect queens and defanged xenomorphs
2020-12-07 21:30:45 -07:00
Darlantan 26665fbf83 Reactivates liquid vore, fixes mode addons 2020-12-06 05:56:51 -05:00
Novacat bb6d7da18a Merge pull request #9412 from VOREStation/Verkister-patch-6
Fixes proteans losing languages when un-blobbing
2020-12-05 16:13:43 +00:00
Chompstation Bot 0368ff40ae Implements negative trait "Neural hypersensitivity" 2020-12-04 20:06:39 +00:00
Novacat 51f032d023 Merge pull request #9401 from Tenryumi/brads-maint-preds
Adds 2 new maintenance predators: Sect queens and defanged xenomorphs
2020-12-03 02:47:21 +00:00
Novacat 552ab27a2a Merge pull request #9389 from Novacat/nova-basicfixes
Removes bug in Protean Regeneration
2020-12-01 14:50:01 +00:00
Razgriz 63170b9c8f Merge pull request #948 from CHOMPStationBot/upstream-merge-9374
[MIRROR] Makes pixel shifting work with custom offsets
2020-11-30 23:20:13 -07:00
Razgriz bc04558f0d Merge pull request #940 from cadyn/fixtraits
Fix broken ass trait bullshit
2020-11-30 23:16:33 -07:00
Razgriz d2a21b1315 Merge pull request #950 from CHOMPStation2/RazgrizBranch1
ohno
2020-11-30 23:13:51 -07:00
Razgriz 6a38e02c0e ohno 2020-11-30 15:20:28 -07:00
cadyn 26d1977857 Merge pull request #941 from cadyn/fixbullets
Ballistics v3.1 Balancing and fixes
2020-11-30 10:50:19 -08:00
cadyn 170800542a Merge pull request #909 from CHOMPStationBot/upstream-merge-9335
[MIRROR] Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
2020-11-30 10:23:12 -08:00
Novacat 4c72df2720 Merge pull request #9374 from VOREStation/Verkister-patch-6
Makes pixel shifting work with custom offsets
2020-11-30 07:23:31 +00:00
Cadyn 670017d41b Ballistics v3.1 2020-11-29 04:51:18 -08:00
Cadyn c69d43a3ed Fix broken ass trait bullshit 2020-11-28 20:22:50 -08:00
Novacat eac394142c Merge pull request #9370 from VOREStation/upstream-merge-7755
[MIRROR] Fixes pointing going under mobs.
2020-11-27 23:11:36 +00:00
cadyn 16b4079be0 Merge pull request #917 from CHOMPStation2/RazgrizBranch1
Change frontier phaser beam-type to ACTUALLY BE a phaser
2020-11-25 22:42:15 -08:00
cadyn 855f42ec48 Fix conflicts 2020-11-25 20:22:48 -08:00
cadyn e9b6e94fa2 Fix conflicts 2020-11-25 20:20:07 -08:00
Razgriz e6a6c4267a Remove mob class for replicant because that won't work 2020-11-24 18:10:53 -07:00
Razgriz 6c0e1fff3e Add a mob class for replicant
Humanoid mob class.
2020-11-24 17:56:16 -07:00
Razgriz d9a05b87cc Merge pull request #916 from CHOMPStation2/RazgrizBranch1
Beepsky ignore certain guns
2020-11-24 03:03:03 -07:00
Razgriz 17ceac5017 Missing ) 2020-11-24 02:19:24 -07:00
Razgriz 85ace9258d Add lasertag weapons to the list 2020-11-24 02:17:06 -07:00
Razgriz f0ed6e20ea Beepsky ignore certain guns
Ignores size gun, flora gun, and confetti cannon
2020-11-24 01:41:46 -07:00
Chompstation Bot da85f80845 Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching 2020-11-24 00:54:34 +00:00
Novacat 8abfb52a6c Merge pull request #9348 from Very-Soft/spellcheckwoofs
Spellcheck the tummy text
2020-11-23 18:33:18 +00:00
Razgriz f5927ffd21 Update metTypes.dm 2020-11-22 22:49:35 -07:00
Razgriz fd3fe0378f QUICK FIX
Hopefully to get jellybrig to retaliate
2020-11-22 16:56:26 -07:00
Razgriz 1009fc4281 Merge pull request #899 from CHOMPStation2/Metroid1.1
Fix struggling of metroid removal, sound addition
2020-11-22 14:47:13 -07:00
Razgriz 1af619dfbd Fix struggling of metroid removal, sound addition
Added a missing code block to allow people to remove the metroid from their heads or to help others. 

Also added the attach sound.
2020-11-22 14:17:31 -07:00
Razgriz 61baa91b22 Merge pull request #887 from CHOMPStationBot/upstream-merge-9336
[MIRROR] Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability
2020-11-22 03:41:36 -07:00
Razgriz b6e792ed4e Merge pull request #881 from CHOMPStationBot/upstream-merge-9330
[MIRROR] Eventy stuff and pet protections!
2020-11-22 03:40:21 -07:00
cadyn 254d4b7bf9 Merge pull request #888 from CHOMPStation2/Metroid1.1
Metroid Event and tweaks
2020-11-22 01:07:26 -08:00
Razgriz c88a691f8b Remove stuff for pacify metroid 2020-11-22 01:14:52 -07:00
Razgriz d2114cba9b Metroid Event and tweaks
-Baby metroids now have a chance of spawning as part of a new major severity event.

-All slime references within metroid code has been removed.

-Some general stats of metroids have been tweaked.
2020-11-22 01:00:16 -07:00
Novacat 08900e9e4a Merge pull request #9336 from Tenryumi/blobs-speak-languages-too
Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability
2020-11-22 04:51:39 +00:00
cadyn 2d06259229 Merge pull request #880 from CHOMPStationBot/upstream-merge-9312
[MIRROR] Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings
2020-11-21 19:58:29 -08:00
cadyn 01f889774e Changing it here too 2020-11-21 08:24:35 -08:00
cadyn 0e616ab2e1 Using the Global Vars system for queen_amount :v 2020-11-21 08:21:29 -08:00
Razgriz 0f8b250789 Merge pull request #882 from CHOMPStation2/master
Master into Metroids1.0 Branch
2020-11-21 01:20:56 -07:00
Razgriz 998efd6f6f ugh 2020-11-21 00:35:37 -07:00
Razgriz 64122fa2a4 Nutrition and attack time updates 2020-11-21 00:11:36 -07:00
Chompstation Bot 26da4ae3f2 Eventy stuff and pet protections! 2020-11-20 17:28:59 +00:00
Chompstation Bot 2e15527ef0 Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings 2020-11-20 15:44:21 +00:00