cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,468 Commits 8 Branches 0 Tags
7c492a3d17ec54cb5c0158979f9827a57cb15d53
Commit Graph

35865 Commits

Author SHA1 Message Date
Novacat
cfcffaeb4d Merge pull request #5727 from Heroman3003/power-shuttle-fix 
Fixes power not updating when shuttle moves
 2019-08-28 16:21:32 -04:00
Novacat
fa340c6cba Merge pull request #5728 from Heroman3003/idfix 
Fixes editing CD access breaking CD access list
 2019-08-28 16:21:15 -04:00
TheFurryFeline
3ea538b217 Shush, Travis 
More error fixing that don't show up in DM.
 2019-08-28 15:36:47 -04:00
TheFurryFeline
11627e943f Fix Rogueminer_vr 
Errors popped up in Travis that didn't show on DM. Thank you... Fixing the screechuing, I hope.
 2019-08-28 15:14:43 -04:00
TheFurryFeline
c068e984f7 Cleanup of Areas Placement 
On the tin, moves all areas from Space Station 13 areas_vr.dm and puts it in tether_areas2.dm
 2019-08-28 13:37:20 -04:00
Heroman
66c6c1b422 Fixes editing CD access breaking CD access list 2019-08-28 19:04:47 +10:00
Heroman
819d211b23 Fixes power not updating when shuttle moves 2019-08-28 18:21:52 +10:00
Unknown
14eb525030 Adjusts Vorestation pills and pillbottles 2019-08-28 04:06:19 -04:00
Novacat
ffb66290db Merge pull request #5726 from VOREStation/upstream-merge-6418 
[MIRROR] Shards Do Damage to Holder
 2019-08-28 01:54:38 -04:00
Novacat
4eea2dad56 Merge pull request #5725 from VOREStation/upstream-merge-6423 
[MIRROR] Ports Bay's stomach pump.
 2019-08-28 01:54:26 -04:00
Atermonera
2162dbfa0b Merge pull request #6418 from MisterLayne/glass_shard_self_harm 
Shards Do Damage to Holder
 2019-08-28 01:25:47 -04:00
Atermonera
4bb0599153 Merge pull request #6423 from chaoko99/stomach_pump 
Ports Bay's stomach pump.
 2019-08-28 01:25:37 -04:00
Unknown
20d87447a9 Removes HoS Voidsuit Stats 2019-08-28 01:24:48 -04:00
Atermonera
bf558eacfd Merge pull request #6417 from MisterLayne/conductivity_fix 
Non-conductive Things Do Not Conduct
 2019-08-28 01:24:24 -04:00
Heroman
0cc54904e2 Fixes slimes not dying outside 2019-08-27 19:52:15 +10:00
Heroman
0ce08f5d36 Fixes meat and density 2019-08-27 15:54:31 +10:00
Heroman
0ebd19a37c Adds morphs 2019-08-27 14:18:17 +10:00
Novacat
98c1225e32 Merge pull request #5717 from VOREStation/upstream-merge-6419 
[MIRROR] Should solve the I.C. printer HREF exploit.
 2019-08-26 23:43:54 -04:00
Atermonera
7fc19250e6 Merge pull request #6419 from Mechoid/PrinterHREF 
Should solve the I.C. printer HREF exploit.
 2019-08-26 23:33:03 -04:00
Atermonera
ec9f1e0e3d Merge pull request #6420 from Mechoid/WhyAmILikeThis 
Fix SLED infinite looping.
 2019-08-26 23:32:52 -04:00
Hawk_v3
0973c49633 Merge remote-tracking branch 'upstream/master' 2019-08-27 00:22:31 +01:00
Glassbrain
b8a202baa9 Customise Say Verb Change 
Changes the "customise say verb" verb to "customise speech verb", solving a small problem of inconvenience that arises when typing "say" incompletely into the command bar, such as if you have a bad habit solidifed into muscle memory.
 2019-08-26 19:19:39 -03:00
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
Unknown
b804342c26 Merge remote-tracking branch 'VOREStation/master' into nova-pathfinder 2019-08-25 22:09:52 -04:00
Heroman
af94e7f374 Fixes some mimic bugs 2019-08-26 10:29:41 +10:00
Rykka_Stormheart
5ad19fed02 Final Update to global.dm - reverts back to previous update and sets mouse spawn timer to 2.5 minutes without multiple/messy edits. 2019-08-25 17:51:21 -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
Unknown
5aad52346a More Fixes 2019-08-25 12:38:34 -04:00
Spades
a33aebe454 Merge pull request #5712 from Mewchild/MC-Hivebot 
Changes Ion Hivebots to not have EMP
 2019-08-25 05:55:07 -04:00
Mewchild
426c7f9e6c Changes Ion Hivebots to not have EMP 2019-08-25 03:13:56 -05: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
Unknown
4bccbedc91 Minor Fixes 
- Brings pizza back at 50 points which it was supposed to be.
 2019-08-24 18:26:50 -04: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
573555fef1 Undoes unintentional default config changes 2019-08-23 13:41:46 +10: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
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01: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