cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,985 Commits 66 Branches 25 Tags
RazMergeTest
Commit Graph
45985 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
RazgrizandGitHub 5eadee2db3 Merge pull request #849 from CHOMPstation/Razgriz1032-Mundane-Meteors 
Mundane meteors disabled
 2019-10-29 03:58:32 -07:00
RazgrizandGitHub bebfaff62e Merge pull request #848 from CHOMPstation/Razgriz1032-metroid-player 
Players as Metroids and tweaks
 2019-10-29 03:52:51 -07:00
RazgrizandGitHub 75fba5e46f Mundane meteors disabled 
Accidentally disabled moderate meteors. Reenabled that and disabled mundane.

Why yes, lets name all three of our event levels with M words.
Mundane
Moderate
Major

THAT'S NOT GONNA GET CONFUSING AT ALL. DOUG DIMMADOME, OWNER OF THE DIMSDALE DIMMADOME! Dimma-don't frakkin confuse me!
 2019-10-29 03:34:27 -07:00
RazgrizandGitHub c7e81c696c Merge pull request #847 from TheFurryFeline/patch-28 
Let the Spiciness Commence!
 2019-10-29 03:31:46 -07:00
RazgrizandGitHub 46f7d84031 Players as Metroids and tweaks 
+Rearranged some code related to player controls that was accidentally badly placed.
+`ai_inactive` variable is now tied to vent hopping, so if there is a player in control, the AI should, in theory, not jump into vents while a player is in control. I hung around one for a minute and nothing happened. Could have been luck of the draw. Dunno.
+Brought down melee armor to 0 for the juvenile metroids.
 2019-10-29 03:30:56 -07:00
TheFurryFelineandGitHub 47dc23435c Let the Spiciness Commence! 
Enables adminhelp_vr.dm in the .dme
 2019-10-29 00:21:36 -04:00
RazgrizandGitHub 3cc96f01aa Merge pull request #846 from Razgriz1032/Razgriz1032-event-disable 
Disabled some events
 2019-10-28 00:00:01 -07:00
RazgrizandGitHub 334285db29 Disabled some events 
Moved mundane meteors and major spiders to disabled. Commented out major slimes and moved it to disabled as it spawned too many and its potency is often underestimated.
 2019-10-27 23:51:03 -07:00
RazgrizandGitHub 94d4c4c28b Merge pull request #842 from TheFurryFeline/TFF-I_SWEAR_THIS_IS_THE_LAST_MAP_FIX_UPDATE 
Major Mapdoot Fix Palooza
 2019-10-27 23:47:12 -07:00
TheFurryFeline aa4d9f2a87 Access Fixes 
Fixes access_req's to Sec Checkpoint buttons, access_req's to Research Med Station doors.
 2019-10-26 18:25:35 -04:00
TheFurryFeline fd451c267f Part 3 
Final commit, T-comms network refactor, Jellybrig mob addition, p90 ammo cartidges in Red Armoury, and more. Edit history in summary of PR will show changes of key points.
 2019-10-26 07:07:41 -04:00
TheFurryFeline 434810057a Merge remote-tracking branch 'upstream/master' into TFF-I_SWEAR_THIS_IS_THE_LAST_MAP_FIX_UPDATE 2019-10-25 22:08:21 -04:00
ExabyteDiscordandGitHub df3c160f4f Merge pull request #845 from ExabyteDiscord/master 
Spicy
 2019-10-23 00:01:46 -07:00
Erik f1ae5d5413 Spicy 
Adds an "Admin Spice" verb, which basically will just tell us to make your round a little bit more entertaining.
 2019-10-22 22:59:35 -07:00
ExabyteDiscordandGitHub bea1b49e67 Merge pull request #3 from CHOMPstation/master 
Doot Doot
 2019-10-22 22:18:02 -07:00
RazgrizandGitHub 09141875ec Merge pull request #841 from TheFurryFeline/TFF-Nurse_Hat_Roleplayers'_Delight 
Nurse Roleplaying Time!
 2019-10-18 13:16:51 -07:00
RazgrizandGitHub 6540265c88 Merge pull request #840 from TheFurryFeline/patch-27 
Grammar/Spelling Fixes
 2019-10-18 13:16:41 -07:00
TheFurryFeline 8334b1f31c Part 2 
POI areas properly fixed for easy distinctions. Confirm all air alarms are placed in proper places. And attempt to make a POI remain unpowered...... (FAILED and shelving for now)
 2019-10-18 07:11:44 -04:00
TheFurryFeline 5f7effbe49 Part One 
Summary in main PR post of things on ToDo list
 2019-10-17 20:28:35 -04:00
TheFurryFeline 46b8f68b82 Chompstation Addition Comment 2019-10-17 19:00:34 -04:00
TheFurryFelineandGitHub 890b9540cf Remove Job Req on Nurse Suits 2019-10-17 18:56:51 -04:00
TheFurryFelineandGitHub a12e0aff4a Add Nurse Hat to Loadout 
Cost 1 point, no job restriction
 2019-10-17 18:55:19 -04:00
ExabyteDiscordandGitHub fd5317d162 Merge pull request #2 from CHOMPstation/master 
Updoot
 2019-10-16 22:44:35 -07:00
TheFurryFelineandGitHub c76752bc63 Moar Spelling Fixes! 
Attempting, not attemping. Skreeeeeee, how long has this been wrong?????
 2019-10-15 06:41:20 -04:00
TheFurryFelineandGitHub 96a782038d Minor Spelling Fix 
Title, fix spelling of vore action for spitters.  Piranha Spitter is attemping to slurped up Samantha Janice Softfur into their stomach! --> Piranha Spitter is attemping to slurp up Samantha Janice Softfur into their stomach!
 2019-10-15 06:38:06 -04:00
RazgrizandGitHub f7f8bc8d83 Merge pull request #838 from kcin2001/vg-borgs 
fixes my previous pr and fixes the module sprites for crisis and surgeon borg
 2019-10-13 14:03:26 -07:00
RazgrizandGitHub 996000dca8 Merge pull request #839 from kcin2001/clean_steps 
makes dirt on step a per mob toggle
 2019-10-13 14:00:06 -07:00
kcin2001andGitHub 402250b93a Merge branch 'master' into clean_steps 2019-10-11 23:57:46 -07:00
kcin2001 893767119e makes dirt making a toggle 2019-10-11 18:37:21 -07:00
kcin2001 285a360312 hotfix and normal fix 2019-10-11 03:48:55 -07:00
RazgrizandGitHub 3bceb23158 Merge pull request #837 from kcin2001/vg-borgs 
copies some borgs from vg to vr and adds them to the lists
 2019-10-10 22:34:05 -07:00
RazgrizandGitHub 6c74f0f9c7 Fix to mochtroid init_vore 2019-10-10 02:02:26 -07:00
kcin2001 8bc979afb9 copies some borgs from vg to vr and adds them to the lists 2019-10-09 14:39:15 -07:00
RazgrizandGitHub cc295f5779 Merge pull request #836 from Razgriz1032/Razgriz1032-shit-opinion 
Removed shit opinion
 2019-10-07 05:14:34 -07:00
RazgrizandGitHub f78fcd5280 Merge pull request #834 from Razgriz1032/Razgriz1032-Metroid-tweak 
Metroid tweak
 2019-10-07 05:14:17 -07:00
RazgrizandGitHub 75a3ec33b0 Add files via upload 2019-10-07 05:06:08 -07:00
RazgrizandGitHub b173948b17 Removed 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.
 2019-10-07 04:59:14 -07:00
RazgrizandGitHub b30a43763d Merge pull request #835 from Razgriz1032/Razgriz1032-isEdible-tweak 
isEdible tweak
 2019-10-07 04:49:32 -07:00
RazgrizandGitHub bbc2122367 isEdible tweak 
Animals can now eat dead animals who were previously inedible
 2019-10-07 04:36:57 -07:00
RazgrizandGitHub 41ac6a3488 Metroid tweak 
+Gave omega metroid a 25 damage laser instead.
+Mochtroid eats faster, but does only 1 burn damage per tick.
+All metroids now only require one human prey to evolve to the next phase except for the Omega. That requires a few more bodies.
 2019-10-07 04:35:32 -07:00
RazgrizandGitHub 4c86d30af3 Merge pull request #823 from TheFurryFeline/patch-23 
Global Output of User is, BEGONE! OUTTA MY SIGHT
 2019-10-07 04:34:04 -07:00
RazgrizandGitHub 3289c44896 Merge pull request #824 from TheFurryFeline/TFF-Mouse_Plushies_LIVE!_LIIIIIIIVE!!!!! 
LET THE PLUSHIES LIVE
 2019-10-07 04:33:49 -07:00
RazgrizandGitHub 4e5a066dca Merge pull request #825 from TheFurryFeline/patch-24 
Timeclock Output Fix
 2019-10-07 04:20:48 -07:00
RazgrizandGitHub 9ef2530447 Merge pull request #826 from TheFurryFeline/patch-25 
New Medals 5/10/19
 2019-10-07 04:20:39 -07:00
RazgrizandGitHub b651d4797a Merge pull request #828 from kcin2001/shadekin 
adds in my shadekin and fixes some shadekin related things
 2019-10-07 04:20:21 -07:00
RazgrizandGitHub a799153a55 Merge pull request #829 from kcin2001/cloak_fix 
fix dept undercoats for tesh
 2019-10-07 04:19:54 -07:00
RazgrizandGitHub d747914c90 Merge pull request #830 from TheFurryFeline/TFF-Belly_Item_Picky-Uppy_Fixy 
Item Pickup In Belly Fix
 2019-10-07 04:19:39 -07:00
RazgrizandGitHub 30a13a3ee6 Merge pull request #831 from TheFurryFeline/patch-26 
Throw Spam Fix
 2019-10-07 04:19:13 -07:00
RazgrizandGitHub 2ac81bc757 Merge pull request #833 from Razgriz1032/Razgriz1032-predator-crate 
More animals in predator crates
 2019-10-07 04:18:44 -07:00
RazgrizandGitHub 6b80cb2ef2 Add files via upload 2019-10-07 04:02:39 -07:00