cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 01:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,216 Commits 9 Branches 0 Tags
a0ab995551a0e8cb15b8ca5f0026aa5f21698cbc
Commit Graph

1774 Commits

Author SHA1 Message Date
Heroman3003
fd263013ed Fixes moth antennae+wing combo not being colorable 2019-04-16 12:42:29 +10:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Novacat
82978caaeb Merge pull request #5021 from Heroman3003/steppy-steppy-on-the-meow 
Fixes step code, again
 2019-04-13 00:08:40 -04:00
Unknown
7dcbc669a2 Fixes Evian's Egg Implant 
It was in a different part of the file so I missed it.
 2019-04-12 23:22:28 -04:00
Heroman
b700a27063 Fixes step code, again 2019-04-13 10:56:05 +10:00
Spades
16ee6b9221 Merge pull request #4897 from Heroman3003/bone-zone 
Added a remains option for digesty vore
 2019-04-12 09:11:04 -04:00
Heroman3003
ecee4b856d Fixes a compile error 2019-04-11 10:56:53 +10:00
Heroman3003
84a5fd4ef4 Makes OOC escape unabsorb 2019-04-11 10:50:10 +10:00
Heroman
6cc3d0a2c4 Fixes promethean transformation 2019-04-09 18:35:50 +10:00
Heroman3003
df99480185 Fixes some problems with species TF 2019-04-09 09:53:49 +10:00
Heroman
148511e6b0 Fixes some issues with BSH 2019-04-08 16:34:36 +10:00
Heroman3003
e0e9158739 Loadout adjustments for access and swimsuits 2019-04-08 10:19:21 +10:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Heroman
12183c890f Fixes swapping/stepping mechanics ignoring the basic passability 2019-04-08 04:48:48 +10:00
saysage
9c47a9c986 Add files via upload 2019-04-07 00:15:20 +03:00
Unknown
4420f0cb81 Fixes Resh's Navy blue HoS Jacket 2019-04-06 13:36:39 -04:00
Heroman
10b9196d26 Admin convinience for remains 2019-04-06 19:12:04 +10:00
Screemonster
629318de74 Refactors regeneration of ravenous races 2019-04-04 06:46:25 +01:00
Unknown
a6732daecc Fixes egg implants 2019-04-03 15:11:06 -04:00
Layla Crosse/Occula Drenn
73cbcfb1e5 Adds Dragonfly wings and a Chameleon tail. 2019-04-02 23:38:03 -04:00
Heroman3003
82ed5a8fe1 Made gurgle bones digestible and trash-edible 2019-04-02 08:42:07 +10:00
Novacat
392ae0e127 Merge pull request #4898 from Heroman3003/flavorful-typo-fix 
Fixes a misnaming on Contamination Flavor selection menu
 2019-03-31 23:08:45 -04:00
Heroman3003
a6cfb63856 slightly adjusts a wording on selection of contamination flavor 2019-04-01 12:39:08 +10:00
Heroman3003
c1d356fe8b Added a remains option to digesty vore 2019-04-01 12:28:02 +10:00
Heroman
704e489bdb Adds proper exiting to step-code for non-human mobs on non-help intent 2019-04-01 07:01:38 +10:00
Novacat
45f2d681c3 Merge pull request #4698 from Wickedtemp/patch-1 
Rebalances Healbelly
 2019-03-31 12:35:04 -04:00
Wickedtemp
181bde4835 Nutrition at 2 
Puts nutrition at 2 with Ace's approval
 2019-03-31 10:19:03 -05:00
Novacat
6729bfb147 Merge pull request #4858 from Heroman3003/uncontamine 
Added ability to toggle and configure contamination and item digestion
 2019-03-28 22:12:38 -04:00
Novacat
4801fe8c8e Merge pull request #4860 from Heroman3003/id-restorer 
Added ID restoration terminal
 2019-03-28 22:03:17 -04:00
Unknown
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Novacat
1aa2f39c0f Merge pull request #4815 from Novacat/nova-aifixes 
Fixes Newspapers
 2019-03-28 21:29:07 -04:00
Novacat
44e3511842 Merge pull request #4812 from TheFurryFeline/patch-1 
Add Resh's HOS Coat
 2019-03-28 21:28:50 -04:00
Novacat
ada7fcd1c4 Merge pull request #4764 from Sharkmare/patch-4 
minor spelling fix
 2019-03-28 20:23:01 -04:00
Novacat
b88035052b Update persist_vr.dm 2019-03-28 20:10:57 -04:00
Novacat
65cd059497 Merge pull request #4751 from VOREStation/upstream-merge-5869 
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
 2019-03-28 18:17:11 -04:00
Novacat
9759df2de4 Merge pull request #4756 from TheFurryFeline/TFF-Vakashi_Permit 
Vakashi's Permit
 2019-03-28 17:40:23 -04:00
Unknown
ad181e797a Conflict Resolution 
Also fixes a compiling error with previous PR
 2019-03-28 17:24:03 -04:00
Novacat
77db377d61 Merge pull request #4748 from Heroman3003/mlembulance 
Tempest's saddlebags now double as ambulance siren/light
 2019-03-28 16:39:37 -04:00
Novacat
f98177b682 Merge pull request #4741 from Jwguy/Silver-KoyoFluffApp 
Adds Koyo's Fluff Item Box
 2019-03-28 16:34:41 -04:00
Unknown
cf39c61c2d Conflict Resolution 
This one made a lynx cry.
 2019-03-28 13:19:19 -04:00
Unknown
6636f1ba37 Conflict Resolution Part 2 2019-03-27 15:51:05 -04:00
Novacat
b91b10aaa5 Merge pull request #4642 from TheFurryFeline/patch-2 
Boost Belly Limit
 2019-03-27 11:22:30 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Heroman3003
ca16b830b1 Added ID restoration terminal near HoP's office 2019-03-20 10:41:36 +10:00
Heroman
f6d9a42c57 Fixes misterming of contamination flavor 2019-03-19 15:55:40 +10:00
Heroman
86f0cb2919 Added ability to toggle and configure contamination and item digestion 2019-03-19 14:46:07 +10:00
Unknown
66c35a6d6d More Fixes 2019-03-03 07:28:28 -05:00
Unknown
856b320091 Fixes Newspapers 2019-03-02 20:52:07 -05:00
Spades
41bcb6a729 Merge pull request #4805 from Sebbe9123/master 
Changes vore egg_types to not interfere with mob egg_types.
 2019-03-02 08:03:58 -05:00