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

60876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nadyr
fd46ebb51a Merge pull request #924 from CHOMPStationBot/upstream-merge-9361 
[MIRROR] ERT Ship Cleanup
 2020-11-28 05:19:28 -05:00
Nadyr
9e3aac4ba5 Merge pull request #918 from CHOMPStationBot/upstream-merge-9356 
[MIRROR] Fixxes some wires and tubes
 2020-11-28 05:13:25 -05:00
Nadyr
60ea7cbadc Merge pull request #908 from CHOMPStationBot/upstream-merge-9351 
[MIRROR] adjusts stage plane
 2020-11-28 05:07:13 -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
cadyn
998cda5825 Merge pull request #939 from CHOMPStation2/ghosthearglobal 
Fix ghost radio
 2020-11-27 16:27:41 -08:00
Cadyn
a9fce95444 Fix ghost radio 2020-11-27 16:17:51 -08: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
7e03ad469a Merge pull request #926 from cadyn/taursprites 
New Taur Sprites
 2020-11-25 20:09:37 -08:00
cadyn
0337e30a8b Merge pull request #927 from cadyn/ohshitohfuck 
I can't believe I've done this.
 2020-11-25 20:09:15 -08:00
Cadyn
49ae612dc4 Maybe forgot this 2020-11-25 19:44:55 -08:00
Cadyn
92acba8db0 New Taur Sprites 2020-11-25 18:39:54 -08:00
Chompstation Bot
0c2948ef70 Prevent cyclic neighbor references in spreading plants 2020-11-25 21:50:11 +00: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
84bac01b9e Merge pull request #923 from cadyn/master 
Making radios even more optimized
 2020-11-25 11:57:26 -08:00
Chompstation Bot
2c3cb1d993 ERT Ship Cleanup 2020-11-25 18:41:25 +00:00
Novacat
0e6265e847 Merge pull request #9361 from KillianKirilenko/kk-ships 
ERT Ship Cleanup
 2020-11-25 18:41:25 +00:00
cadyn
f1c9b60bf8 Fuck okay maybe intercoms move sometimes 2020-11-24 23:24:36 -08:00
cadyn
d260757e91 yumyum radio go vroom hehe 2020-11-24 22:45:41 -08:00
Razgriz
8231cf5f55 Merge pull request #921 from CHOMPStation2/cadyn-patch-3 
If the fixes the lag I will cry
 2020-11-24 23:19:29 -07: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
cadyn
21acd90c21 If the fixes the lag I will cry 2020-11-24 15:34:02 -08: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
Razgriz
f86ac8eb30 Merge pull request #920 from CHOMPStationBot/upstream-merge-9337 
[MIRROR] Move away from Travis CI to GitHub Actions
 2020-11-24 12:42:51 -07:00
Razgriz
4c8db4a43e Merge pull request #910 from CHOMPStationBot/upstream-merge-9340 
[MIRROR] Update librust_g.so with an Ubuntu 16.04 compatible version
 2020-11-24 12:28:17 -07:00
Chompstation Bot
db1c95c6a7 Move away from Travis CI to GitHub Actions 2020-11-24 19:00:16 +00:00
Chompstation Bot
ddc70e1668 Fixxes some wires and tubes 2020-11-24 16:03:51 +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
NanoMap Generation
d75cce93e8 NanoMap Auto-Update (Tue Nov 24 03:49:13 UTC 2020) 2020-11-24 03:49:13 +00:00
Razgriz
75def0a44a Merge pull request #906 from CHOMPStationBot/upstream-merge-9348 
[MIRROR] Spellcheck the tummy text
 2020-11-23 20:47:33 -07:00
Razgriz
3c23b06b9b Merge pull request #905 from Kazzc/MinorMapdates 
Minor Map Updates
 2020-11-23 20:47:02 -07:00
Razgriz
a7633393b5 Merge pull request #904 from CHOMPStationBot/upstream-merge-9346 
[MIRROR] Fix #9345
 2020-11-23 20:46:27 -07:00
Razgriz
9abf260700 Merge pull request #903 from CHOMPStationBot/upstream-merge-9344 
[MIRROR] Nanomaps actually generate correctly now
 2020-11-23 20:45:09 -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
Razgriz
22d4eb4ca1 Revert "Spear and Gun sizes" 
This reverts commit e3ffa1e081.
 2020-11-23 19:22:52 -07:00
Razgriz
e3ffa1e081 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:19:42 -07:00
Chompstation Bot
b3e984bbdc Update librust_g.so with an Ubuntu 16.04 compatible version 2020-11-24 00:54:42 +00:00
Novacat
3b147ee4c7 Merge pull request #9340 from VOREStation/compatible-rust-g 
Update librust_g.so with an Ubuntu 16.04 compatible version
 2020-11-24 00:54:42 +00:00