cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,876 Commits 8 Branches 0 Tags
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
Commit Graph

11952 Commits

Author SHA1 Message Date
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
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
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
Razgriz
5762ef8a25 Metroid 1.0 
Finally. Adds the full SR388 metroid bestiary. You got baby metroids, super metroids, alpha, gamma, zeta, omega, and queen. They are weak to bullet-type weapons and most are super weak to bombs.

The baby and supers act just like slimes in that they will succ head, so click them to get them off. The rest can still gain nutrition via melee and vore. If they get enough nutrition, they will evolve to their next phase.

Cold guns will do 100 damage per tick to baby and super metroids. The rest lose their cold vulnerability.
 2020-11-19 20:45:37 -07:00
Razgriz
1a192a6a9b Update simple_mob.dm 2020-11-19 13:43:54 -07:00
Razgriz
3dcd6240d5 ranged_cooldown_time variable for mobs 
This is the addition of a new mob variable that will allow mobs to move and shoot at the same time. This section here is special snowflake code for metroids only, or for whatever else in the future that you want to have move and shoot at the same time. Basically, this is a non-stupid version of "ranged_attack_delay." "ranged_attack_delay" is stupid because it sleeps the entire mob. This new ranged_cooldown_time is smarter in the sense that it is an internalized timer. Try not to confuse the names.
 2020-11-19 04:05:03 -07:00
Razgriz
1ad25e5cdb Mouse spontaneous vore changes 
For mice, I changed the following:
Allowed for being spontaneous prey.
Disallowed for being spontaneous predator.
 2020-11-19 01:47:09 -07:00
Razgriz
cbf220a4b7 Undo accidental commit to master with another commit to master 
lol
 2020-11-19 01:46:26 -07:00
Razgriz
3fece6ec6b Mouse spontaneous vore changes 
For mice I changed the following:
Allowed for being spontaneous prey.
Disallowed for being spontaneous predator.
 2020-11-19 01:45:39 -07:00
Novacat
c73420518a Merge pull request #9323 from VOREStation/upstream-merge-7759 
[MIRROR] Fix Simplemob+ Organs
 2020-11-18 22:14:58 +00:00
Verkister
6699d74e8c Merge pull request #9318 from VOREStation/Verkister-patch-5 
Fixes hotkey emotes not getting the proper textbox
 2020-11-17 22:06:07 +00:00
cadyn
4a6b57ae01 Update negative_ch.dm 2020-11-16 00:00:16 -08:00
cadyn
c25d59d84b fix singularity metabolism bruh 2020-11-15 23:56:01 -08:00
cadyn
4e2da5ae98 fix stupid bugs ree 2020-11-15 23:52:27 -08:00
Razgriz
5afa72a83e Merge pull request #844 from CHOMPStation2/metroid 
Current Metroid Progress
 2020-11-15 13:59:33 -07:00
Verkister
e612636a10 Merge pull request #9309 from VOREStation/Verkister-patch-5 
Fixes pixel shifting breaking offsets
 2020-11-15 19:08:13 +00:00
cadyn
e22d99d936 Merge pull request #847 from CHOMPStationBot/upstream-merge-9298 
[MIRROR] Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 02:09:07 -08:00
cadyn
d75c393d2f Merge pull request #846 from CHOMPStationBot/upstream-merge-9307 
[MIRROR] Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss
 2020-11-15 02:08:13 -08:00
cadyn
1db7b1d2e6 Merge pull request #845 from CHOMPStationBot/upstream-merge-9304 
[MIRROR] Balance fixes and bugfixes
 2020-11-15 02:07:40 -08:00
cadyn
d2a2b301cc Merge pull request #829 from cadyn/traits-v2 
Cadyn's traits v2
 2020-11-15 00:54:35 -08:00
cadyn
a67c751841 Merge branch 'master' into upstream-merge-9307 2020-11-15 00:48:22 -08:00
Verkister
f5c125eaff Merge pull request #9298 from Tenryumi/piper-hair 
Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 08:46:24 +00:00
Chompstation Bot
f932e65178 Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss 2020-11-15 08:44:14 +00:00
Razgriz
02d51b5756 Merge branch 'master' into metroid 2020-11-14 15:25:04 -07:00
Novacat
1efc4bcd9f Merge pull request #9304 from Novacat/nova-basicfixes 
Balance fixes and bugfixes
 2020-11-14 17:54:59 +00:00
Razgriz
f70d48cfce Update Metroid Progress 2020-11-14 04:17:46 -07:00
Razgriz
cd71309e32 Add files via upload 2020-11-14 04:12:57 -07:00