cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,807 Commits 9 Branches 0 Tags
c8a2fbb0660d3e6279ddf58b6852c0d0f8ec5544
Commit Graph

22972 Commits

Author SHA1 Message Date
Novacat
c8a2fbb066 Update mouse_vr.dm 2019-08-26 16:09:05 -04:00
Rykka_Stormheart
c9f1bc43c3 I think I did this right? 
I'M SO CONFUSED.
 2019-08-26 12:27:53 -06:00
Rykka_Stormheart
12ec96d9c2 Corrected edits to apply to _vr.dm files rather than source/master files where possible. 
Apologies for the possibly-sloppy edit to global_vr.dm </3
 2019-08-25 11:31:58 -06:00
Rykka_Stormheart
116f532169 Several mice tweaks, mainly: 
Uncommented out the mice pull_size and mob_pull - this fixes mice pulling lockers and shit.
Reduced mouse spawn time by half, since mice are nerfed now to not be able to pull large shit. (As they shouldn't be able to.)
Merged/incorporated file from https://github.com/VOREStation/VOREStation/pull/5709 - his was simple_animal, I moved it to simple_mob. All credits for changes in mouse_vr.dm go to them.

Small Fixes:
Added a little extra comment to the mice examine text. <3
Fixed the "Observe" Spawn timer - it originally said 5 minutes, fixed it to show the "actual" respawn time - 60 seconds.
 2019-08-25 00:15:33 -06:00
Novacat
6b8a80152f Merge pull request #5706 from Heroman3003/xenobio-sanity 
Adjusts xenobio closer to pre-refactor state
 2019-08-24 04:00:53 -04:00
Heroman
d71013d7f5 Adds exception for noscan species 2019-08-24 17:35:04 +10:00
Heroman
b0fa4e0dc7 Adjusts xenobio closer to pre-refactor state 2019-08-24 17:01:35 +10:00
Atermonera
2c8197bd9a Merge pull request #6415 from Heroman3003/bellfixes 
Adjusts some desk bell mechanics
 2019-08-23 21:43:38 -04:00
Heroman
8f880a9d82 Fixes secbots ignoring access for pull attacks 2019-08-24 05:43:41 +10:00
Novacat
1f6e7ff5ed Merge pull request #5700 from Heroman3003/merc-heat-fix 
Fixes mercenaries in spacesuits dying from Virgo 2 heat
 2019-08-23 03:01:56 -04:00
Heroman
6a21eccbd5 Fixes mercenaries in spacesuits dying from Virgo 2 heat 2019-08-23 16:23:08 +10:00
Novacat
c7c64f7551 Merge pull request #5696 from Heroman3003/shell-restrictions 
Restricts AI shells module- and z-level- wise
 2019-08-23 01:38:59 -04:00
Novacat
6032c38264 Merge pull request #5695 from Heroman3003/smitekin 
Returns shadekin smites
 2019-08-23 00:04:22 -04:00
Heroman
a20aa6be0b Fixes AI shells not getting the channels properly 2019-08-23 13:41:17 +10:00
Atermonera
3b3dce0e8c Merge pull request #6414 from InterroLouis/Typo-Fix 
Rigsuit Typo Fix
 2019-08-22 23:39:02 -04:00
Heroman
7c27f801f7 Restricts AI shells module- and z-level- wise 2019-08-23 12:25:21 +10:00
Heroman
f118fe8eda Returns shadekin smites 2019-08-23 10:46:42 +10:00
Novacat
15b48aa712 Merge pull request #5689 from Novacat/nova-basicfixes 
Redemption Machine Changes
 2019-08-21 22:42:50 -04:00
Novacat
2c4cd96be7 Merge pull request #5396 from KasparoVy/taur_hide_stuff 
Allows Tails to Hide Bodyparts, Shoes & Clip Uniforms/Suits
 2019-08-21 22:15:53 -04:00
Unknown
a7bc6b858d Redemption Machine Changes 
- Brings back silver pickaxe
- Merges Polaris and Virgo Exploration Vendors
- Ports early fixes to exploration vendor from Polaris
 2019-08-21 20:17:39 -04:00
Novacat
775d175b11 Merge pull request #5682 from VOREStation/upstream-merge-6358 
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
 2019-08-21 18:02:59 -04:00
Novacat
06fcadf97f Merge pull request #5688 from VOREStation/upstream-merge-6396 
[MIRROR] Chemistry Expansion
 2019-08-21 18:01:11 -04:00
Novacat
666d7836fc Merge pull request #5687 from VOREStation/upstream-merge-6410 
[MIRROR] Promethean Organ Tweakening
 2019-08-21 17:54:37 -04:00
Novacat
bf0e8f65de Merge pull request #5686 from VOREStation/upstream-merge-6397 
[MIRROR] Blind rage doesn't mean actually make them blind.
 2019-08-21 17:54:06 -04:00
Novacat
17c2ba18be Update equipment_vendor.dm 2019-08-21 17:49:53 -04:00
Atermonera
8f067fe785 Chemistry Expansion 2019-08-21 17:43:01 -04:00
Atermonera
65b6dc762c Merge pull request #6410 from Mechoid/PrometheanOrgans1 
Promethean Organ Tweakening
 2019-08-21 17:40:45 -04:00
Novacat
6bce101afc Update misc_special.dm 2019-08-21 17:32:42 -04:00
Atermonera
3d1f76e4f1 Merge pull request #6397 from Mechoid/BerserkUnblinding 
Blind rage doesn't mean actually make them blind.
 2019-08-21 17:30:09 -04:00
Atermonera
caa612e264 Uniform Adjustments Phase 1 2019-08-21 17:26:28 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
Heroman
2238bc2e16 Fixes not being able to pick up or drop items in bellies 2019-08-21 16:53:14 +10:00
Heroman
c0de032943 Fixes Merc Commando's corpse being named Syndie Commando 2019-08-21 04:54:03 +10:00
KasparoVy
a9cfaa602a Adds Clip Masks Tailored to Alraune and Wasps 
Their body shapes were just too different from the default template especially around the pelvis so I made a couple clip masks for alraune and wasps.
 2019-08-20 02:13:58 -04:00
KasparoVy
a94c975cfe Account for Taur Suits in Uniform Icon Generation - Suit Checking 
Since we don't clip when wearing taursuits in suit icon generation we gotta maintain the same behaviour when we check suits in uniform icon generation.
 2019-08-20 01:56:09 -04:00
KasparoVy
d9b1e02405 Tails/Taurs Hide Shoes & Clip Uniforms/Suits 
Hides shoes when the goat legs or taur bodies are selected.
Adds a method by which you can clip off parts of sprites, ported from Para.

Sets goat legs & taur bodies to clip off the lower parts of uniforms and suits
so long as the clothing doesn't hide tails or is a taur suit.
 2019-08-20 01:56:08 -04:00
KasparoVy
e762c191ea Adds Ability for Tails to Hide Bodyparts 
Adds a method for tails to hide bodyparts like legs to allow for a bit more spriter freedom. Sets Satyr legs & taur bodies to prevent regular legs from rendering when selected.

E.g.1 The Satyr legs & taur bodies prevent the regular leg organs from rendering, so you no longer have to sprite them such that they cover the pixels ordinary legs would've occupied.

E.g.2 The deer body has bulky front legs because if they weren't sprited to cover the regular body beneath you'd have wierd pixels poking out. This prevents that from happening by preventing legs from rendering when you got a taur tail.
 2019-08-20 01:45:46 -04:00
Heroman
e8a9a537cd More emergency fixes 2019-08-20 11:49:09 +10:00
CRTXBacon
1b368e978d Update custom_items_vr.dm 2019-08-20 00:11:26 +01:00
Novacat
dfed56f83e Merge pull request #5615 from Michiyamenotehifunana/Toricrates-Remastered 
Resprites Crates (And stuff like the cargo tug)
 2019-08-19 17:07:23 -04:00
Novacat
a6cda4268a Merge pull request #5648 from sharpestlight/master 
wasp taurs
 2019-08-19 16:57:19 -04:00
Novacat
df9f9fff42 Merge pull request #5634 from Heroman3003/grenadefix 
Restricts station use of manhack grenades and seismic charges
 2019-08-19 16:57:04 -04:00
Novacat
99d9653902 Merge branch 'master' into Toricrates-Remastered 2019-08-19 16:56:12 -04:00
Novacat
dea67ec3bb Merge pull request #5608 from Mewchild/MC-Quality 
Removes Awoo speech
 2019-08-19 16:55:19 -04:00
Novacat
d84f38b4db Merge pull request #5581 from TheFurryFeline/TFF-Faces_4_Seats 
Allows you to sit on someone's head
 2019-08-19 16:55:05 -04:00
Atermonera
9c3ef7da32 Merge pull request #6405 from Nalarac/patch-1 
Changes Hooligan Crab Meat to Crab Meat
 2019-08-19 01:03:57 -04:00
Novacat
1131e32aad Merge pull request #5652 from Heroman3003/fishing-nerf 
Nerfs damage of the fishing rods
 2019-08-18 20:55:27 -04:00
Heroman
8bf8a16340 Nerfs damage of the fishing rods 2019-08-19 10:30:58 +10:00
Heroman
4dc79f669e Ports early fixes 2019-08-19 10:00:46 +10:00
sharplight
ae106e186c wasp taurs 
added wasp taurs to the game
 2019-08-18 13:54:07 -04:00