cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 07:56:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,224 Commits 66 Branches 25 Tags
0e82f4f3bf63c1915729d2e512c0d2d400366381
Commit Graph
39224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
SpadesandGitHub 0e82f4f3bf Merge pull request #2332 from Verkister/backuppery 
Adds a mind backup nifsoft and fixes sleevemate nif and quit issues.
 2017-10-21 23:17:49 -04:00
SpadesandGitHub 58847349de Merge pull request #2326 from VOREStation/Cameron653-patch-1 
Makes soulcatcher actually purchasable for most jobs
 2017-10-21 23:17:28 -04:00
SpadesandGitHub be26c2cc25 Merge pull request #2323 from saysage/master 
Hotfix #3 for my custom clothes.
 2017-10-21 23:17:13 -04:00
SpadesandGitHub 838654f9d5 Merge pull request #2339 from Verkister/unbrutal 
Removes the minimum limits to gurgle damage and scales the nutrition gain with them.
 2017-10-21 23:15:53 -04:00
SpadesandGitHub 433627ca15 Merge pull request #2335 from Yewmi/panda-time 
Adds character options for panda ears and eye markings
 2017-10-21 23:14:18 -04:00
SpadesandGitHub 6182145592 Merge pull request #2333 from Verkister/blendtweakery 
Just some contrast adjustments on hair and teshari bases.
 2017-10-21 23:14:00 -04:00
SpadesandGitHub 8737b2b65e Merge pull request #2338 from Yewmi/halloween-punkin 
Adds halloween pumpkins and jack-o'lanterns
 2017-10-21 23:13:43 -04:00
SpadesandGitHub 7571b5c5cc Merge pull request #2345 from Yoshax/acewhy 
Reverts Ace's changes to make parapens functional
 2017-10-21 14:14:26 -04:00
Yoshax d58293749e Reverts Ace's changes to make parapens functional 2017-10-21 17:50:07 +01:00
SpadesandGitHub 31196ccef0 Merge pull request #2343 from VOREStation/Cameron653-patch-3 
Adds holo collar to loadout
 2017-10-20 17:18:16 -04:00
Cameron653andGitHub d1e939a50d Adds holo collar to loadout 2017-10-20 16:24:29 -04:00
SpadesandGitHub e8a9bb7ffc Merge pull request #2325 from VOREStation/Cameron653-patch-3 
Assistant fix
 2017-10-20 14:54:07 -04:00
SpadesandGitHub e2296c8db6 Merge pull request #2341 from Verkister/prevbgs 
Adds rng backgrounds to character setup preview.
 2017-10-20 14:53:22 -04:00
VerkisterandGitHub c430022447 I actually made the lower limit obsolete with the scaling oops 2017-10-20 21:19:23 +03:00
Verkister d58cacc85a Scales the nutrition gain according to gurgledamage. 2017-10-20 20:50:02 +03:00
Verkister 32b8cbc080 Okay made it 1 minimum for both. 2017-10-20 20:39:01 +03:00
Verkister ee83f721c4 Adds rng backgrounds to character setup preview. 
-They swap upon every preview refresh.
-Current selection comes with full black, full white, 'steel' floor tiles, white flor tiles, bare plating, and reinforced floor.
-We'll see if I feel like figuring out how to make a proper selection button later.
 2017-10-20 20:35:21 +03:00
Verkister 5d97f81047 Sets the minimum digest brute to 0 from 3. 
-Afaik the 3 was supposed to be like the minimum total damage for the slowest gurgles, but with the limit being applied to both damage types, the actual minimum damage was restricted to 2+3 or 3+3 depending whether you had touched the default brute value or not, basically causing the slowest possible digestion still being faster than default.
 2017-10-20 12:57:42 +03:00
SpadesandGitHub def5fadfa9 Merge pull request #2327 from VOREStation/Cameron653-patch-2 
Gives prometheans the drain trait
 2017-10-20 02:07:09 -04:00
Yumi (AKA Gowst) 7b87993993 Adds halloween pumpkins and jack-o'lanterns, pumpkins replaces all potted plants on station 2017-10-20 00:52:16 -05:00
Cameron653andGitHub ffd86c394e Merge pull request #2337 from VOREStation/Cameron653-patch-4 
I accidentally reversed the messages
 2017-10-19 22:01:58 -04:00
Cameron653andGitHub 02e61a6f04 Update station_special_abilities_vr.dm 2017-10-19 21:46:47 -04:00
Cameron653andGitHub b270124ae7 I accidentally reversed the messages 2017-10-19 21:43:41 -04:00
Verkister 1dce46894a Should fix bypassing the round quit with sleevemate 2017-10-20 03:12:58 +03:00
Yumi (AKA Gowst) 110f23bbbe adds panda ears and eye markings to character customization 2017-10-19 16:06:53 -05:00
Verkister 318affbc9b Just some contrast adjustments on hair and teshari bases. 2017-10-19 13:23:37 +03:00
Verkister e7fc6a3800 Adds a mind backup nifsoft and fixes one-time scans not saving nifs. 
-Adds a nifsoft that can be used for manual mind backups on the go sleevemate style.
-Fixes one-time backups not saving nifs (sleevemate and this thing)
-Apparently the backup proc only saved nifs on the second sync.
 2017-10-19 12:16:53 +03:00
Cameron653andGitHub 1f78750513 Gives prometheans the drain trait 
Because why not
 2017-10-18 21:42:20 -04:00
SpadesandGitHub 5b1ca0edfc Merge pull request #2324 from VOREStation/Cameron653-patch-2 
Fixes omni filters
 2017-10-18 19:32:20 -04:00
Cameron653andGitHub 0a347293a9 Update 13_soulcatcher.dm 2017-10-18 18:13:57 -04:00
Cameron653andGitHub 3dcb301391 Assistant fix 2017-10-18 14:10:31 -04:00
Cameron653andGitHub d2426d3aca Fixes omni filters 2017-10-18 13:42:29 -04:00
saysageandGitHub 6938063223 Add files via upload 2017-10-18 20:17:00 +03:00
saysageandGitHub c7fcd4e2de Delete custom_clothes_vr.dmi 2017-10-18 20:15:16 +03:00
LeshanaandGitHub 9f1da7346e Merge pull request #2317 from VOREStation/Cameron653-patch-1 
Updates Travis to 512.1392
 2017-10-18 01:20:39 -04:00
Cameron653andGitHub afa7b01ac1 Updates Travis to 512.1392 2017-10-17 23:49:18 -04:00
Cameron653andGitHub ad7eeac1c6 Merge pull request #2316 from VOREStation/Cameron653-patch-2 
Fixes a 512 compile error.
 2017-10-17 23:48:30 -04:00
Cameron653andGitHub 35afdc29c9 Fixes a 512 compile error. 2017-10-17 23:40:07 -04:00
SpadesandGitHub 38989ca507 Merge pull request #2313 from Cyantime/patch-1 
Fixes the sizegun's origin_tech
 2017-10-17 20:16:38 -04:00
CyantimeandGitHub 231859ae27 Fixes the sizegun's origin_tech 2017-10-17 19:15:43 -04:00
SpadesandGitHub bbb74ef462 Merge pull request #2312 from Verkister/traitfix 
Fixes a game breaking conflict related to disabled polaris trait system
 2017-10-17 12:10:16 -04:00
SpadesandGitHub 1f6c17fc99 Merge pull request #2311 from Verkister/tailfixens 
Just some hair shading tweaks
 2017-10-17 12:09:59 -04:00
Verkister a5146769e0 Fixes a game breaking conflict related to disabled polaris trait system 2017-10-17 13:27:20 +03:00
Verkister a51bfcdb16 hair tweaks again 2017-10-17 11:33:24 +03:00
SpadesandGitHub 0a5379bbcd Merge pull request #2310 from saysage/master 
Hotfix #2 because I know nothing about code and found second mistake only now
 2017-10-17 04:23:04 -04:00
SpadesandGitHub c4f54630db Merge pull request #2309 from Verkister/tailfixens 
Fixes the horrible teshari conversion and the special type tails using wrong blend mode.
 2017-10-17 04:22:44 -04:00
saysageandGitHub f0bc8028e9 Update custom_items.txt 2017-10-17 11:16:07 +03:00
Verkister f161a7102f also fixes the teshari blend tweaks 
-holy shit those turned out bad initially
 2017-10-17 10:32:55 +03:00
Verkister 23b81fa0ed Fixes the special type tails using wrong blend mode. 
-The ones using effects/species_tails_vr.dmi
-Unathi, tajaran, sergal(old), akula, nevrean, tesh, fox, fennec.
 2017-10-17 09:36:12 +03:00
SpadesandGitHub 163c686d18 Merge pull request #2308 from Cameron653/master 
Mid October Polaris Sync
 2017-10-16 22:44:23 -04:00