cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 06:56: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
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
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
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
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 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 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 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 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 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
TheFurryFelineandGitHub 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
RazgrizandGitHub 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
SharkmareandGitHub 5186268b97 Asteri vore flavor 2019-09-30 01:00:22 +02:00
SharkmareandGitHub 725d93a26c Update synx.dm 2019-09-29 11:25:50 +02:00
SharkmareandGitHub e329ad8366 Commander geese now spawn 2 geese 
Yes possibility to be a commander applies to these
 2019-09-28 10:25:03 +02:00
SharkmareandGitHub 7840c51fd0 Update goose.dm 2019-09-26 16:13:32 +02:00
SharkmareandGitHub d2ef366e83 Adding a little extra for the enxt goose idea 2019-09-26 15:45:44 +02:00
SharkmareandGitHub 537a9986db honk 2019-09-26 12:19:06 +02:00
SharkmareandGitHub 106a5f6fb0 Update goose.dm 2019-09-26 11:29:00 +02:00
SharkmareandGitHub 42259479a3 Drop items 2019-09-26 11:22:32 +02:00
SharkmareandGitHub d2e81ac86e Update goose.dm 2019-09-26 11:14:12 +02:00
SharkmareandGitHub dabe6483c3 Update goose.dm 2019-09-26 11:01:08 +02:00
SharkmareandGitHub 9a5e40a00e Update goose.dm 2019-09-26 10:59:30 +02:00
SharkmareandGitHub 585bbdb557 Update goose.dm 2019-09-26 10:57:20 +02:00
SharkmareandGitHub 55e123018f Untitle Goose Update 
Allows Geese to carry items
++Egg++
 2019-09-26 10:54:47 +02:00
RazgrizandGitHub a188fb737d Merge pull request #811 from Razgriz1032/Razgriz1032-Jellybrig-Code 
Metroids and Jellybrig
 2019-09-24 04:54:32 -07:00
RazgrizandGitHub e4741c5e88 spelling 2019-09-24 04:15:55 -07:00
RazgrizandGitHub 42354bb376 Merge pull request #810 from Razgriz1032/Razgriz1032-isEdible-fix 
isEdible fix loop fix
 2019-09-24 04:12:17 -07:00
RazgrizandGitHub 64fcac54ea Metroids and Jellybrig 
Coded in Jellybrig, a potential HoS pet. Comes with his own vore flavor text.

Tweaked armor values again for metroids, primarily for the juvenile stages. For the juvenile stage, increased health again, discovered that - armor was a thing and greatly increased vulnerability to bullets, decreased resistance to energy damage, increased melee armor.
 2019-09-24 04:11:56 -07:00
RazgrizandGitHub a513eefe70 isEdible fix loop fix 
Prevents vore mobs from attempting to vore other mobs that are inedible. Without this they just got stuck in a loop trying to eat each other and deal no damage.
 2019-09-24 03:35:51 -07:00
SharkmareandGitHub d231c0a40b adding sprites 2019-09-23 20:17:48 +02:00
SharkmareandGitHub 76bcacd677 Update synx.dm 2019-09-23 19:42:58 +02:00
SharkmareandGitHub 07c6909ed8 Update synx.dm 2019-09-23 16:48:47 +02:00
SharkmareandGitHub 96a7e71751 SYN-KinC 
SYN
Kinetic Combat units.
 2019-09-23 16:39:10 +02:00
RazgrizandGitHub 1981bfc33f Merge pull request #800 from Razgriz1032/Razgriz1032-metroid-fix 
Metroid Fix and Nerf
 2019-09-19 12:54:57 -07:00
RazgrizandGitHub a26a135d74 Metroid Fix and Nerf 
Fixed baby and juvenile forms from disappearing into vents after death. Adjusted armor values for metroids. Increased maximum damage threshold for super metroids to 9.
 2019-09-19 04:21:20 -07:00
RazgrizandGitHub a79e197c64 Merge pull request #793 from JesusChristItsJasonBourne/GenSwappers 
gender swapping potions
 2019-09-08 18:10:46 -07:00