cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 03:56:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
46,030 Commits 66 Branches 25 Tags
master
Commit Graph
22344 Commits
Author SHA1 Message Date
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
RazgrizandGitHub 1776096948 Merge pull request #822 from Razgriz1032/Razgriz1032-Hardsuit 
CE Hardsuit name and Pursuit Hardsuit thrusters
 2019-10-01 20:22:13 -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
RazgrizandGitHub 281c038140 Merge pull request #816 from TheFurryFeline/patch-20 
Reduce Webbing Cost to 1
 2019-10-01 20:14:00 -07:00
RazgrizandGitHub 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
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
RazgrizandGitHub d1eeb31bcb Merge pull request #814 from JesusChristItsJasonBourne/vineblacklist 
Vineblacklist
 2019-09-28 10:08:19 -07: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
TheFurryFelineandGitHub 22dc75959b Reduce Webbing Cost to 1 
Title.
 2019-09-26 23:15:12 -04: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
JesusChristItsJasonBourne 96cc1cbcec removed extra comma 2019-09-26 11:43:23 +10:00
JesusChristItsJasonBourne 355a186862 vine blacklist update 
blacklists certain chems from spawning with vines upon request
 2019-09-25 20:28:44 +10:00
JesusChristItsJasonBourne 84494b2165 vines blacklist update 
made vines not spawn with certain chems for various reasons, all of this was upon request.
 2019-09-25 20:19:35 +10:00
TheFurryFeline d3a48f8e40 Fix Roundstart Runtimes 
Title: Casino had a few more reagents that weren't labelled correctly for carrotjuice, applejuice, tomatojuice. beepsky_smash refactored to beepskysmash as well as royrogers.
 2019-09-24 11:38:57 -04: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
RazgrizandGitHub 6ab556fabb Merge pull request #808 from Sharkmare/patch-100 
SYN-KinC
 2019-09-24 00:29:28 -07:00
RazgrizandGitHub d3355ac7c0 Merge pull request #805 from TheFurryFeline/TFF-Orange_Is_The_New_Orange 
Orange Is the New Orange!
 2019-09-24 00:25:42 -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
TheFurryFeline 4c5332a145 Redo to Fix Mistake With Icons 
That was annoying with how that went.... Bad idea to overwrite the files with direct copy-pasta'ing from Polaris. Idea: Do it again but make a different name and copy the desired icon_state. Yay! It works!
 2019-09-22 12:53:54 -04:00
TheFurryFeline 1f3aa1dd27 Revert "Orange Is the New Orange!" 
This reverts commit 686c3adf9b.
 2019-09-21 18:35:56 -04:00
TheFurryFeline 686c3adf9b Orange Is the New Orange! 
Add a new version of the orange jumpsuit and refactors the prison one to be a different obj path. Prison and Orange jumpsuits are both selectable in the loadout via Jumpcloth Selection. New .dmi updates for the whole thing as well.
 2019-09-21 18:04:11 -04:00
TheFurryFeline 1167db21fd Slots Copying Palooza 
Ports https://github.com/PolarisSS13/Polaris/pull/5988 so you can copy your character slot info over to another one if you have the space.
 2019-09-20 16:33:36 -04:00
kcin2001andGitHub ad55a73f86 add the flavor text for collar noms 2019-09-19 15:34:06 -07:00
kcin2001andGitHub ea3f2e7405 Merge branch 'master' into TRASH 2019-09-19 14:01:55 -07:00
kcin2001 49c2f7294e adds more objets to be eaten, and special list for synths 2019-09-19 13:57:04 -07: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 d272a5a5a5 Merge pull request #797 from ExabyteDiscord/ErikTheDogEdits 
Realistic Salt
 2019-09-14 13:44:01 -07:00
Erik Darkpaws b0283e8440 damage fix 2019-09-13 23:21:06 -07:00
Erik Darkpaws c0e15a3f44 Normal OD But Oxy 2019-09-13 23:10:56 -07:00