cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-11 15:13:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,985 Commits 66 Branches 25 Tags
RazMergeTest
Commit Graph

22329 Commits

Author SHA1 Message Date
Razgriz 5eadee2db3 Merge pull request #849 from CHOMPstation/Razgriz1032-Mundane-Meteors 
Mundane meteors disabled
 2019-10-29 03:58:32 -07:00
Razgriz 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
Razgriz 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
Razgriz 3cc96f01aa Merge pull request #846 from Razgriz1032/Razgriz1032-event-disable 
Disabled some events
 2019-10-28 00:00:01 -07:00
Razgriz 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
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
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
Razgriz 09141875ec Merge pull request #841 from TheFurryFeline/TFF-Nurse_Hat_Roleplayers'_Delight 
Nurse Roleplaying Time!
 2019-10-18 13:16:51 -07:00
TheFurryFeline 46b8f68b82 Chompstation Addition Comment 2019-10-17 19:00:34 -04:00
TheFurryFeline 890b9540cf Remove Job Req on Nurse Suits 2019-10-17 18:56:51 -04:00
TheFurryFeline a12e0aff4a Add Nurse Hat to Loadout 
Cost 1 point, no job restriction
 2019-10-17 18:55:19 -04:00
TheFurryFeline c76752bc63 Moar Spelling Fixes! 
Attempting, not attemping. Skreeeeeee, how long has this been wrong?????
 2019-10-15 06:41:20 -04:00
TheFurryFeline 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
Razgriz 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
kcin2001 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
Razgriz 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
Razgriz 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
Razgriz cc295f5779 Merge pull request #836 from Razgriz1032/Razgriz1032-shit-opinion 
Removed shit opinion
 2019-10-07 05:14:34 -07:00
Razgriz f78fcd5280 Merge pull request #834 from Razgriz1032/Razgriz1032-Metroid-tweak 
Metroid tweak
 2019-10-07 05:14:17 -07:00
Razgriz 75a3ec33b0 Add files via upload 2019-10-07 05:06:08 -07:00
Razgriz 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
Razgriz bbc2122367 isEdible tweak 
Animals can now eat dead animals who were previously inedible
 2019-10-07 04:36:57 -07:00
Razgriz 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
Razgriz 3289c44896 Merge pull request #824 from TheFurryFeline/TFF-Mouse_Plushies_LIVE!_LIIIIIIIVE!!!!! 
LET THE PLUSHIES LIVE
 2019-10-07 04:33:49 -07:00
Razgriz 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
Razgriz 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
Razgriz 30a13a3ee6 Merge pull request #831 from TheFurryFeline/patch-26 
Throw Spam Fix
 2019-10-07 04:19:13 -07:00
Razgriz 2ac81bc757 Merge pull request #833 from Razgriz1032/Razgriz1032-predator-crate 
More animals in predator crates
 2019-10-07 04:18:44 -07:00
Razgriz 4334685ae4 Add files via upload 2019-10-07 03:21:54 -07:00
Razgriz 38867b2303 Removed Inflatable Trait 
It's now being migrated to the vore panel.
 2019-10-07 03:19:28 -07:00
TheFurryFeline 8b2a1e8607 Item Pickup In Belly Fix 
Port of https://github.com/VOREStation/VOREStation/pull/5676
 2019-10-06 20:02:13 -04:00
TheFurryFeline ec86215718 Throw Spam Fix 
Title, ported from https://github.com/PolarisSS13/Polaris/pull/6463
 2019-10-06 19:48:35 -04:00
kcin2001 4d3875480b fix types conflict because that didnt work how i thought 2019-10-06 00:34:37 -07:00
kcin2001 a10310fdda Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into shadekin 
# Conflicts:
#	code/modules/mob/living/simple_animal/vore/shadekin/types.dm
#	icons/mob/vore_shadekin.dmi
#	icons/mob/vore_shadekin64.dmi
 2019-10-06 00:30:58 -07:00
kcin2001 67dc400350 adds softpatch (kcin2001's shadekin) and fixes stuff 2019-10-05 23:48:57 -07:00
TheFurryFeline f2bd35f46a LET THE PLUSHIES LIVE 
Changes icon states for mouse plushies to NOT be resembling dead mice. :C
 2019-10-03 01:11:41 -04:00
Razgriz 1776096948 Merge pull request #822 from Razgriz1032/Razgriz1032-Hardsuit 
CE Hardsuit name and Pursuit Hardsuit thrusters
 2019-10-01 20:22:13 -07:00
Razgriz d3d45f2649 Merge pull request #820 from Sharkmare/patch-102 
Fixing loot spawning of Dare Button + New Synx Pet
 2019-10-01 20:14:47 -07:00
Razgriz 281c038140 Merge pull request #816 from TheFurryFeline/patch-20 
Reduce Webbing Cost to 1
 2019-10-01 20:14:00 -07:00
Razgriz ad60fe98e1 CE Hardsuit name and Pursuit thrusters 
Removed flavor text regarding the CE's hardsuit as a "voidsuit".
Added thrusters to the Pursuit Hardsuit as regular jetpacks don't work with it.
 2019-10-01 20:12:12 -07:00
Sharkmare 5186268b97 Asteri vore flavor 2019-09-30 01:00:22 +02:00
Sharkmare 725d93a26c Update synx.dm 2019-09-29 11:25:50 +02:00
Razgriz d1eeb31bcb Merge pull request #814 from JesusChristItsJasonBourne/vineblacklist 
Vineblacklist
 2019-09-28 10:08:19 -07:00
Sharkmare e329ad8366 Commander geese now spawn 2 geese 
Yes possibility to be a commander applies to these
 2019-09-28 10:25:03 +02:00
TheFurryFeline 22dc75959b Reduce Webbing Cost to 1 
Title.
 2019-09-26 23:15:12 -04:00
Sharkmare 7840c51fd0 Update goose.dm 2019-09-26 16:13:32 +02:00
Sharkmare d2ef366e83 Adding a little extra for the enxt goose idea 2019-09-26 15:45:44 +02:00