cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 14:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,985 Commits 66 Branches 25 Tags
RazMergeTest
Commit Graph
10116 Commits
Author SHA1 Message Date
TheFurryFeline b4a9be9e9c Dear Deer's Hunger 
Fixes Deer mob's spawning when created either through adminspawn or cargo order. Either way, they were spawning without a belly obj and causing a runtime in DEBUG logs.
 2019-05-22 15:24:21 -04:00
SharkmareandGitHub 80acff79bf Smile. 
Sic semper tyrannis
 2019-05-10 18:32:21 +02:00
HiziaanandGitHub 7ffdd56fca Merge pull request #670 from TheFurryFeline/patch-18 
We Are Chompers!
 2019-05-08 18:38:37 -05:00
TheFurryFeline 6ebc182880 Digestion Hotfix 
Reverts code that broke how digestion damaged you.
 2019-05-08 18:55:10 -04:00
TheFurryFelineandGitHub b27be55b9a We Are Chompers! 
Changes loading screen name in examine. Just right-clicking previously showed Polaris. This fixes such.
 2019-05-07 18:12:16 -04:00
TheFurryFelineandGitHub 7ad2be48e2 Egg Fix 
🥚
 2019-05-04 22:03:09 -04:00
TheFurryFelineandGitHub 2ffebfd507 Borgs' and Micros' Delight 
Allow borgs to make micro mechs.
 2019-05-02 22:36:42 -04:00
TheFurryFelineandGitHub 367eb1f448 Vehicle Buckling Fix 
Fixes bug with vehicle buckling.
 2019-05-02 22:14:51 -04:00
HiziaanandGitHub 046a467e0a Merge pull request #656 from TheFurryFeline/TFF-I_Got_A_Bone_To_Pick_With_You 
I Got A Bone To Pick With You
 2019-05-01 00:34:17 -05:00
TheFurryFelineandGitHub b7340c4f94 It's a Crate! Or is it? 
Prevent metagamey-ness stuff with Mechanical Vore Prefs displaying.
 2019-04-30 23:50:31 -04:00
TheFurryFelineandGitHub a56ed90e0c Refactor Species Names 
On the tin, plus additional piggybacking with other edits from VoreStation related to this to make it all work. >w>
 2019-04-30 23:48:36 -04:00
HiziaanandGitHub 83034ac661 Merge pull request #655 from TheFurryFeline/TFF-Reagent_Implants_Loadout 
Reagent Implants Loadout
 2019-04-30 14:59:24 -05:00
TheFurryFelineandGitHub 6935e3237e Filepath Change 
New loadout selection refactors this a little bit. By removing one word, maybe, but it's still a refactor. Blep.
 2019-04-30 11:03:03 -04:00
RazgrizandGitHub 550467123d Icon fix 2019-04-28 11:57:47 -07:00
AnonymousHybiandGitHub 29492e1621 Attempt to fix 2019-04-24 15:46:43 +01:00
TheFurryFelineandGitHub fce1e53ea4 Indents Causes Warnings. Begone! 
On the tin, mostly. Forces some if statements to execute properly and not trigger Travis.
 2019-04-24 09:06:09 -04:00
RazgrizandGitHub 452abbdf4a Metroids nearly finished 
Metroids are just about feature complete. Just missing a couple small fluff gimmicks. Also remaining sprites.
This document here has information on that, and variables such as health, damage, etc
https://docs.google.com/document/d/1CVcxN6uRlbfNt3koGDib_3Kvz4GErOuoS-yCaUtlYuM/edit?usp=sharing
 2019-04-18 22:05:00 -07:00
HiziaanandGitHub 634ab49be1 Merge pull request #643 from TheFurryFeline/TFF-QoL_Changes1 
QoL Changes - Round 1
 2019-04-18 22:31:42 -05:00
HiziaanandGitHub d4f9810405 Merge pull request #642 from Razgriz1032/Razgriz1032-moth-spawn-2 
Fix attempt 2 at solarmoth spawn count
 2019-04-18 22:03:21 -05:00
RazgrizandGitHub 7a7a9ccd31 Fix attempt 2 at solarmoth spawn count 
Solargrubs should now only ever evolve two solarmoths.
Deleted some slightly more complicated code in favor of slightly less complicated code.
 2019-04-18 19:49:36 -07:00
TheFurryFelineandGitHub 44363f05e2 *Emits an Affirmative Blip* 
Fixes emotes so that synths can use the *yes emote without it just doing squat. Ported from https://github.com/VOREStation/VOREStation/pull/5076
 2019-04-18 22:42:50 -04:00
TheFurryFelineandGitHub 80966bba6d *Emits an Affirmative Blip* 
Fixes emotes so that synths can use the *yes emote without it just doing squat. Ported from https://github.com/VOREStation/VOREStation/pull/5076
 2019-04-18 22:42:46 -04:00
TheFurryFelineandGitHub 279e0c15f6 Nerf Mach 5 Wheelchairs 
This one really makes the wheelchairs nerfed this time. You're welcome, Jon. Ported from https://github.com/VOREStation/VOREStation/pull/5087
 2019-04-18 21:40:34 -04:00
TheFurryFelineandGitHub 1a339cdcde Prommy Lunchboxes Keep Mice 
Forces a mouse to spawn with you **inside** the lunchbox a Prommy spawns with. Fix ported from https://github.com/VOREStation/VOREStation/pull/5093
 2019-04-18 20:56:54 -04:00
TheFurryFeline 0ecc3d9b6c Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into CHOMPstation-master 2019-04-18 20:32:39 -04:00
Jon d2c80d0f8b Egg 2019-04-17 22:40:23 +01:00
AnonymousHybiandGitHub 9f9ad44782 Merge pull request #638 from AnonymousHybi/master 
Nose booping.
 2019-04-15 21:02:18 +01:00
Jon 47c7547e61 Nose booping. 2019-04-15 20:53:33 +01:00
HiziaanandGitHub 6ef12f960f Merge pull request #635 from TheFurryFeline/patch-13 
Wallet/Micro Fun For Roboticists!
 2019-04-14 16:49:37 -05:00
HiziaanandGitHub 462c08229d Merge pull request #633 from TheFurryFeline/TFF-TF_Fixes 
Prommy Party Time
 2019-04-14 16:49:27 -05:00
TheFurryFelineandGitHub ac02425496 Wallet/Micro Fun For Roboticists! 
Allow use of micros/wallets for unlocking borgs. Ported from https://github.com/VOREStation/VOREStation/pull/4990
 2019-04-14 17:40:15 -04:00
TheFurryFelineandGitHub 26983350dd Wallet/Micro Fun For Roboticists! 
Allow use of micros/wallets for unlocking borgs. Ported from https://github.com/VOREStation/VOREStation/pull/4990
 2019-04-14 17:31:05 -04:00
TheFurryFelineandGitHub 618462fb63 TF Fix 
Ports VoreStation fixes for TF
 2019-04-14 16:35:26 -04:00
VollyballyandGitHub cb7b5c1918 Merge pull request #625 from Razgriz1032/Razgriz1032-Mochtroid-fix 
Mochtroid icon code fix
 2019-04-12 00:52:28 -04:00
RazgrizandGitHub f528101746 Mochtroid icon code fix 2019-04-11 21:33:55 -07:00
VollyballyandGitHub ddb2ddd349 Merge pull request #621 from Razgriz1032/Razgriz1032-Electric-Spider-MovenShoot2 
Electric spider Move_Shoot fix
 2019-04-11 13:11:39 -04:00
RazgrizandGitHub 0d8c6e91df MoveAndShoot optimization 
Added if statements to state 3 and 4 of the mob's states so that it won't run the MoveAndShoot() proc unless the mob's move_shoot var is true.
 2019-04-09 18:56:06 -07:00
RazgrizandGitHub 313ced5c6c Move_Shoot fix 
Changed move_shoot from 0 to 1
 2019-04-09 18:52:40 -07:00
SharkmareandGitHub 0f7f8e2d98 Restructure of power trans code for drones. 2019-04-09 13:17:14 +02:00
VollyballyandGitHub b681f4de43 Merge pull request #606 from Razgriz1032/Razgriz1032-Metroid-Sprites-and-Code-1 
Metroid sprites and code
 2019-04-09 00:07:14 -04:00
RazgrizandGitHub cbba953ae1 Update metroidsSimple.dm 2019-04-08 18:24:05 -07:00
VollyballyandGitHub 52b1f97241 Merge pull request #609 from Razgriz1032/Razgriz1032-Lizardman-hands 
Lizardman hands
 2019-04-08 18:55:20 -04:00
VollyballyandGitHub 56294861c9 Merge pull request #612 from TheFurryFeline/TFF-The_Bigger_The_Better 
The Bigger, The Better
 2019-04-08 18:54:46 -04:00
TheFurryFelineandGitHub a7bc16a255 Size Prefs 2019-04-08 11:24:19 -04:00
RazgrizandGitHub ba26d4d786 Lizardman hands 
They now have hands if a player is assigned to play as a lizardman.
 2019-04-07 20:35:02 -07:00
VollyballyandGitHub 8ba25344f5 Merge pull request #608 from Razgriz1032/Razgriz1032-Solargrub-evolution-time-increased 
Increased Solargrub evolution time
 2019-04-07 23:32:13 -04:00
RazgrizandGitHub f763d05f59 Increased Solargrub evolution time 
Changed required evolution charge from 16000 to 32000.
Changed evolution probability from 2% to 1%.

Originally it would take about maybe 7 minutes for a grub to evolve. Should take more than double that now.
 2019-04-07 20:14:00 -07:00
VollyballyandGitHub aa51201412 Merge pull request #604 from Razgriz1032/Razgriz1032-Electric-Spider-MoveNShoot 
Electric Spider move and shoot
 2019-04-07 23:05:46 -04:00
VollyballyandGitHub 3e50515d56 Merge pull request #605 from Razgriz1032/Razgriz1032-Moth-Health-Nerf 
Solarmoth health and armor nerf
 2019-04-07 22:49:02 -04:00
RazgrizandGitHub 39d55924ca Metroid progress 
Changed the minetroid to be the sprite of a mochtroid. Metroid evolutions up to Gamma are in. Gamme features not complete. Final stats on all metroids (except the mochtroid) are not complete. Please do not use them yet.
 2019-04-07 19:42:08 -07:00