cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-10 01:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,882 Commits 7 Branches 0 Tags
d7e45f74bd548bd16cef8b607084564d68b4bf7b
Commit Graph

28189 Commits

Author SHA1 Message Date
Nadyr
d7e45f74bd Merge pull request #937 from CHOMPStationBot/upstream-merge-9370 
[MIRROR] [MIRROR] Fixes pointing going under mobs.
 2020-11-28 05:31:47 -05:00
Nadyr
e0ddf92c82 Merge pull request #907 from CHOMPStationBot/upstream-merge-9349 
[MIRROR] More ship and turret fixes
 2020-11-28 05:06:31 -05: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
89b7b1d89a Make phasers be orange like classic star trek :) 2020-11-25 22:40:59 -08:00
cadyn
97581dfcdf Merge pull request #925 from CHOMPStationBot/upstream-merge-9362 
[MIRROR] Prevent cyclic neighbor references in spreading plants
 2020-11-25 20:24:12 -08:00
Cadyn
92acba8db0 New Taur Sprites 2020-11-25 18:39:54 -08:00
Novacat
f92c8d9fc4 Merge pull request #9362 from ShadowLarkens/patch-1 
Prevent cyclic neighbor references in spreading plants
 2020-11-25 21:50:11 +00:00
cadyn
f1c9b60bf8 Fuck okay maybe intercoms move sometimes 2020-11-24 23:24:36 -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
39b810d0fc And humanoids 
Ok this should work for mercs as well
 2020-11-24 17:28:09 -07:00
Razgriz
a83b1ce6e3 And xenos 2020-11-24 16:17:59 -07:00
Razgriz
eb3c70d668 SA_bonus_damage to structures, beam dam tweak 2020-11-24 15:47:52 -07:00
Chompstation Bot
db1c95c6a7 Move away from Travis CI to GitHub Actions 2020-11-24 19:00:16 +00:00
Razgriz
5c3991ef47 Change phaser beam-type 
Because FUN FACT: Phasers were actually using regular beams.

After looking through the code during my gun and spear size PR, I made the realization that there are two types of phasers, but we were all under the impression that they only did 5 damage to people and full damage to mobs. This is true of phasers. However the Frontier Phasers are a Virgo weapon and apparently are not phasers at all, they are lasers, and do indeed use lasers, NOT phasers. So I am fixing that.

Pros of change:
-I created a new beam type for the phaser beam. The OG Phaser uses a short-ranged, slow-moving projectile. So I made that, but made it look like the default laser beam. I also copied the damage numbers, so you do lots more damage to animals now.
-You won't friendly fire people as badly because people were under the impression that these only did 5 damage to people.

Cons:
It won't do its full damage potential vs. non-animal MOB_CLASS, i.e. mercs and mechs.
 2020-11-24 03:11:29 -07:00
Razgriz
d9a05b87cc Merge pull request #916 from CHOMPStation2/RazgrizBranch1 
Beepsky ignore certain guns
 2020-11-24 03:03:03 -07:00
Razgriz
83694b7f50 Merge pull request #914 from CHOMPStation2/Razgriz1032-patch-8 
Remove shit opinion
 2020-11-24 03:02: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
Razgriz
65e67665c4 Merge pull request #911 from CHOMPStation2/RazgrizBranch1 
Spear and Gun sizes
 2020-11-24 01:22:41 -07:00
Razgriz
734e5d532a Remove shit opinion 
Removed a stanza that prevented some flexibility with the digestion for mobs, and also the returned comment was highly unprofessional.
You can now toggle the digestion mode on simple animals. You will be warned that using this to break OOC prefs is against the rules before doing so. Right click the mob and toggle their digestion.

It's VORE it's not meant to be balanced anyway.
 2020-11-24 00:16:18 -07:00
Razgriz
82c3e60ea3 Tweak metroid event weight 
It was too high.
 2020-11-23 22:09:58 -07:00
Razgriz
f0ace37d4f Spear and Gun sizes 
-Made all gun and spear sizes larger so that they will no longer fit into backpacks.
--Energy spears and energy swords will fit while deactivated, but not while active (unchanged)

-Tweaked the Floragun have no recoil for micros.
 2020-11-23 19:29:48 -07:00
Novacat
652a7d75d1 Merge pull request #9349 from Novacat/nova-basicfixes 
More ship and turret fixes
 2020-11-23 22:19:11 +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
3b9a4407df Merge pull request #900 from CHOMPStationBot/upstream-merge-9339 
[MIRROR] Fixes digested PDAs dropping IDs on the floor
 2020-11-22 23:35:13 -07:00
Razgriz
f5927ffd21 Update metTypes.dm 2020-11-22 22:49:35 -07:00
Novacat
35d97e041c Merge pull request #9339 from VOREStation/Verkister-patch-5 
Fixes digested PDAs dropping IDs on the floor
 2020-11-23 04:55:57 +00: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
e32cc58cb7 Merge pull request #877 from cadyn/ballistics-v3 
Ballistics v3
 2020-11-22 01:09:17 -08:00
cadyn
425ce61041 Merge pull request #884 from Kazzc/SC-MapUpdate 
Civilian sector overhaul.
 2020-11-22 01:08:56 -08: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
Razgriz
9b44e90793 Merge pull request #878 from CHOMPStation2/Metroid1.0 
Metroid 1.0
 2020-11-21 20:53:32 -07:00
cadyn
a8d22c84a8 fix stupid shit 2020-11-21 19:12:41 -08:00
cadyn
1da78774a8 Even more conflicts. Yum. 2020-11-21 18:52:36 -08:00
cadyn
c23558a35d More conflicts yay 2020-11-21 18:51:16 -08:00
Kassc
9d660c4222 Merge pull request #1 from CHOMPStation2/master 
merge master into branch
 2020-11-21 21:24:20 -05:00
cadyn
0ce5d797be Update 07_traits.dm 2020-11-21 14:06:36 -08:00
cadyn
ca04b0ef72 Make the station gateway work :p 2020-11-21 13:24:49 -08:00
cadyn
01f889774e Changing it here too 2020-11-21 08:24:35 -08:00