cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,936 Commits 6 Branches 0 Tags
7372e6cd148214f94e35255b6800436cf6fe803c
Commit Graph

62936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nadyr
7372e6cd14 Update vending_machines_vr.dm 2021-04-09 02:31:23 -04:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Nadyr
23af41589b Merge pull request #1754 from Verkister/reloadfix 
Fixes vorepanel reload.
 2021-04-08 00:36:44 -04:00
Nadyr
78bbd3a233 Merge pull request #1762 from CHOMPStation2/Razgriz1032-patch-slowdown 
[Manual MIRROR]Nerfs Item Slowdown
 2021-04-08 00:35:26 -04:00
Nadyr
6fcd524b43 Merge pull request #1761 from CHOMPStationBot/upstream-merge-10094 
[MIRROR] Readds wing hiding toggles lost in retabbening
 2021-04-08 00:34:39 -04:00
Nadyr
653039c1ba Merge pull request #1758 from CHOMPStationBot/upstream-merge-10091 
[MIRROR] More VB/Typhon Tweaks
 2021-04-08 00:32:37 -04:00
Nadyr
5b32cf7bd1 Merge pull request #1756 from CHOMPStationBot/upstream-merge-10090 
[MIRROR] Resize fix and polish
 2021-04-08 00:31:31 -04:00
Razgriz
5649c572c3 [Manual MIRROR]Nerfs Item Slowdown 
Ports https://github.com/VOREStation/VOREStation/pull/10093
"Time to start tackling the thing that made hasty/hardy meta necessary in the first place.

A kind of lazy fix but I would rather do this than do a 500-file refactor."


🆑
tweak: Any worn item that slowed you down now slows you down less. Also, any worn item that speeds you up speeds you up less.
/🆑

Chems should remain unaffected. Dunno about sprinter hardsuit module.
 2021-04-07 16:35:16 -07:00
Chompstation Bot
c1af6820b1 Readds wing hiding toggles lost in retabbening 2021-04-07 21:15:47 +00:00
Novacat
2241c1b1a3 Merge pull request #10094 from Verkister/patch-46 
Readds wing hiding toggles lost in retabbening
 2021-04-07 21:15:47 +00:00
Chompstation Bot
d02ba0fec0 More VB/Typhon Tweaks 2021-04-07 17:32:43 +00:00
Chompstation Bot
a5530e0319 Resize fix and polish 2021-04-07 15:52:56 +00:00
Novacat
9f5bd65d67 Merge pull request #10090 from Nyksia/resize-fix 
Resize fix and polish
 2021-04-07 15:52:56 +00:00
Verkister
df3288aa99 Fixes vorepanel reload. 
Adds a proc argument var for the vorebelly reload to bypass the 1-belly vore init load optimization thingy.
 2021-04-07 13:28:26 +03:00
Razgriz
1b9c7ace1a Buff spider count (#1752) 
Min 2 and max 3 to min 6 and max 12.

Also added var for min overall so that I can leave the other two vermin alone.
 2021-04-06 18:13:55 -07:00
Razgriz
a95d7fa746 Update spider_infestation.dm 2021-04-06 16:28:07 -07:00
Nadyr
51dce347cc Merge pull request #1748 from CHOMPStationBot/upstream-merge-10087 
[MIRROR] Disables maps with Mercenaries
 2021-04-06 01:48:46 -04:00
Nadyr
2690d27f88 Merge pull request #1747 from CHOMPStationBot/upstream-merge-10086 
[MIRROR] Catgirl sprite fixes
 2021-04-06 01:46:48 -04:00
Nadyr
4efcf7ddb5 Merge pull request #1746 from CHOMPStationBot/upstream-merge-10084 
[MIRROR] Fixes buckle-scoop jank
 2021-04-06 01:45:28 -04:00
Nadyr
41c128818f Merge pull request #1744 from CHOMPStationBot/upstream-merge-10081 
[MIRROR] Typhon ORB
 2021-04-06 01:43:06 -04:00
Nadyr
e253e0cc22 Merge pull request #1742 from CHOMPStationBot/upstream-merge-10079 
[MIRROR] tram+station take 2
 2021-04-06 01:42:43 -04:00
Chompstation Bot
44bce08766 Disables maps with Mercenaries 2021-04-06 03:54:03 +00:00
Novacat
ef82958d12 Merge pull request #10087 from Novacat/nova-ert 
Disables maps with Mercenaries
 2021-04-06 03:54:03 +00:00
Chompstation Bot
e8cb02058f Catgirl sprite fixes 2021-04-06 01:19:37 +00:00
Novacat
38c80ff479 Merge pull request #10086 from ArgobargSoup/ArgoCatgirlSpriteFix 
Catgirl sprite fixes
 2021-04-06 01:19:37 +00:00
Chompstation Bot
69a0cbbc2e Fixes buckle-scoop jank 2021-04-05 23:04:25 +00:00
Novacat
f88b031492 Merge pull request #10084 from Verkister/patch-45 
Fixes buckle-scoop jank
 2021-04-05 23:04:25 +00:00
Chompstation Bot
d6bd66a90f Typhon ORB 2021-04-05 14:29:16 +00:00
Novacat
a176db8edc Merge pull request #10081 from KillianKirilenko/kk-mapping 
Typhon ORB
 2021-04-05 14:29:16 +00:00
Chompstation Bot
76e61abca6 tram+station take 2 2021-04-05 05:30:18 +00:00
BlackMajor
3a9b149617 Adds event pref to character directory at Kassc's request (#1666) 
* Revert "Merge pull request #1 from CHOMPStation2/master"

This reverts commit b85a3b312d, reversing
changes made to a13aa8f367.

* Revert "Revert "Merge pull request #1 from CHOMPStation2/master""

This reverts commit 1149323e69.

* added event pref to directory

* Oh wait tgui gets mad at in-line comments
 2021-04-04 21:46:06 -07:00
Razgriz
0b809f8f62 Merge pull request #1738 from Darlantanis/WheatleySergalTaur 
Sprite refactor, sergal taur for Wheatley
 2021-04-04 21:45:30 -07:00
Razgriz
2931eb27b5 Merge pull request #1737 from Darlantanis/PeriFix 
Revert peridaxon recipe change
 2021-04-04 21:44:55 -07:00
Nadyr
4da74822d7 Merge pull request #1708 from CHOMPStationBot/upstream-merge-10049 
[MIRROR] [MIRROR] Explorer uniform now has rolldown and sleeve states.
 2021-04-05 00:05:25 -04:00
Nadyr
2d545b921f Add files via upload 2021-04-04 23:47:44 -04:00
Nadyr
c9aa0430c5 Merge pull request #1740 from CHOMPStationBot/upstream-merge-10076 
[MIRROR] Von Braun OFD
 2021-04-04 23:13:49 -04:00
Nadyr
d862734fb8 Merge pull request #1739 from CHOMPStationBot/upstream-merge-10075 
[MIRROR] Fixes regular tether
 2021-04-04 23:13:13 -04:00
Chompstation Bot
5fe10d073c Von Braun OFD 2021-04-04 23:24:48 +00:00
Novacat
cb0c7873a8 Merge pull request #10076 from KillianKirilenko/kk-adminships 
Von Braun OFD
 2021-04-04 23:24:48 +00:00
Chompstation Bot
9b83467e3f Fixes regular tether 2021-04-03 23:44:02 +00:00
Novacat
e42a947c69 Merge pull request #10075 from Heroman3003/fix 
Fixes regular tether
 2021-04-03 23:44:02 +00:00
Darlantan
59485aa770 Sprite refactor, sergal taur for Wheatley 2021-04-03 07:17:48 -04:00
Darlantan
39a376ef2c Revert peridaxon change 2021-04-03 04:35:16 -04:00
Nadyr
871db4f853 Merge pull request #1159 from CHOMPStationBot/upstream-merge-9589 
[MIRROR] Makes the beach cool
 2021-04-03 04:24:43 -04:00
Nadyr
94a7b22673 Update vorestation.dme 2021-04-03 04:14:20 -04:00
Nadyr
0f363490d3 Merge pull request #1718 from CHOMPStationBot/upstream-merge-10062 
[MIRROR] Some minor mapfixes
 2021-04-03 04:10:04 -04:00
Nadyr
e9d27277e2 ugh 2021-04-03 03:54:35 -04:00
Nadyr
73f361ff34 Update vorestation.dme 2021-04-03 03:48:42 -04:00
Nadyr
aa860247bf Update vorestation.dme 2021-04-03 03:33:34 -04:00
Nadyr
f447d3c309 Create virgo4_vr 2021-04-03 03:31:47 -04:00