cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,041 Commits 8 Branches 0 Tags
b801f6d8469795b811d88cb1563d53ce8cc1cbda
Commit Graph

75041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fluff
b801f6d846 Balancing Changes 
-Make the Super Boss function
-Lowered candy mob delay and added bellies I think
-Made MoL prettier
 2023-06-21 16:32:34 -04:00
Fluff
1c1b33812f AGGG typos 
Typos are my bane
 2023-06-20 15:56:47 -04:00
Fluff
fabbfe36bc Making things pretty 
Made more things look nicer, and adjusted some mob stats
 2023-06-20 15:50:50 -04:00
Fluff
f4987062af Adding names to areas, and adjusting armor 
Title
 2023-06-20 11:02:56 -04:00
Fluff
461e7689aa Map Edits 
More edits
 2023-06-19 15:11:21 -04:00
Fluff
53aba35b4a Making things look nicer, and fixing visuals 
Title
 2023-06-19 11:10:45 -04:00
Fluff
132c301e1a Merge remote-tracking branch 'origin/BaseBlep' into BranchBlep 2023-06-17 11:12:01 -04:00
Fluff
8ed384caed MORE GATWAYS 
Not going to lie, I have done minimal testing. Code should work.
 2023-06-17 11:11:27 -04:00
Razgriz
f571d6cb7d Merge pull request #6376 from CHOMPStation2/upstream-merge-15026 
[MIRROR] Re-adjusts Altevian Weapons
 2023-06-16 11:40:08 -07:00
Razgriz
4361f83fb2 Merge pull request #6380 from CHOMPStation2/upstream-merge-15029 
[MIRROR] feature: Adds admin logging to disposals incidents
 2023-06-16 11:38:36 -07:00
Razgriz
a18a3e933c Merge pull request #6381 from CHOMPStation2/upstream-merge-15030 
[MIRROR] Fixes the invisible Alien Saw
 2023-06-16 11:38:01 -07:00
Razgriz
fa81630d04 Merge pull request #6382 from Seris02/ipwhitelist 
ip whitelists for those in the same home
 2023-06-16 11:36:46 -07:00
Razgriz
35de2d5119 Merge pull request #6384 from CHOMPStation2/upstream-merge-15034 
[MIRROR] The cyborg can has a saw... as a treat
 2023-06-16 11:34:26 -07:00
Razgriz
f526221fb1 Merge pull request #6386 from ItsSelis/tracy 
Adds Tracy integration
 2023-06-16 11:32:43 -07:00
Razgriz
e614f536a8 Merge pull request #6387 from ItsSelis/tiny-github-ci-fix 
Tiny GitHub CI Fix
 2023-06-16 11:31:27 -07:00
Selis
2a6d65a6d4 Comments out include 2023-06-16 19:39:48 +02:00
Selis
338fb4127d adds vr areas 2023-06-16 19:01:30 +02:00
Selis
014e851218 CHOMPedit Comment 2023-06-16 18:24:54 +02:00
Selis
d8773879c6 Adds tracy integration 2023-06-16 18:20:56 +02:00
CHOMPStation2
479d3b6e95 The cyborg can has a saw... as a treat 2023-06-16 12:27:15 +00:00
Heroman3003
cece4d3f61 Merge pull request #15034 from Youtubeboy139/cyborg_saw_fix 
The cyborg can has a saw... as a treat
 2023-06-16 12:27:14 +00:00
Seris02
cf690461db ip whitelists 2023-06-16 16:47:05 +08:00
CHOMPStation2
57b696b7a6 Fixes the invisible Alien Saw 2023-06-16 06:30:35 +00:00
Heroman3003
286ddeb7cc Merge pull request #15030 from Youtubeboy139/saw_fix 
Fixes the invisible Alien Saw
 2023-06-16 06:30:35 +00:00
CHOMPStation2
013401758a feature: Adds admin logging to disposals incidents 2023-06-16 06:30:29 +00:00
Heroman3003
5a2b7dd32c Merge pull request #15029 from Runa-Dacino/disposals 
feature: Adds admin logging to disposals incidents
 2023-06-16 06:30:29 +00:00
CHOMPStation2
a9d913b20b Re-adjusts Altevian Weapons 2023-06-15 23:11:18 +00:00
Heroman3003
bcd039779a Merge pull request #15026 from Enzo-Leon/weapons-tune 
Re-adjusts Altevian Weapons
 2023-06-15 23:11:17 +00:00
Razgriz
d4c5742d6c Merge pull request #6366 from FoxglovePurpur/purdev-loaf_fix 
Foxloaf Fix
 2023-06-14 11:10:55 -07:00
Digi Purpur
71d7a3547c Loaf Fix™️ 
Fixed the forward facing loaf.
 2023-06-14 10:14:44 -07:00
Razgriz
97f03b62e9 Merge pull request #6365 from Rykka-Stormheart/master 
Fix errant comment breaking .dme includes
 2023-06-14 09:52:23 -07:00
Rykka Stormheart
82159bd428 Fix errant comment breaking .dme 2023-06-14 09:43:32 -07:00
Razgriz
ef3c9f8985 Merge pull request #6334 from Rykka-Stormheart/shep-dev-silent-ear-ringing 
[BUGFIX] Replaces middle ear ring loop with truly silent loop
 2023-06-14 09:36:14 -07:00
Razgriz
5e3b256fe3 Merge pull request #6362 from FoxglovePurpur/purdev-foxloaf 
Foxtaur Loaf Addition
 2023-06-13 14:19:02 -07:00
Razgriz
c6a3a93929 Merge pull request #6363 from FoxglovePurpur/purdev-wordfix 
GPS  Word / Spelling Fix
 2023-06-13 14:18:30 -07:00
FoxglovePurpur
64b47796ca Update pai.dm 
Fixed the comment <3
 2023-06-13 14:13:27 -07:00
FoxglovePurpur
0d98a543f4 Update gps.dm 
Fixed the comment(s) <3
 2023-06-13 14:12:46 -07:00
FoxglovePurpur
0425181669 Update bodybag.dm 
Fixed the comment <3
 2023-06-13 14:12:10 -07:00
FoxglovePurpur
f945b95790 Update blueprints_vr.dm 
Fixed the comment <3
 2023-06-13 14:11:40 -07:00
FoxglovePurpur
64c343ec0e Update global_lists_vr.dm 
Fixed the comment <3
 2023-06-13 14:11:14 -07:00
FoxglovePurpur
5585311d8a Update vorestation.dme 
Adding (correct) comments this time.
 2023-06-13 14:10:38 -07:00
FoxglovePurpur
11cb4b2bde Update pai.dm 
Added missing comment.
 2023-06-13 14:08:33 -07:00
FoxglovePurpur
d6dff02608 Update gps.dm 
Added missing comment(s).
 2023-06-13 14:06:00 -07:00
FoxglovePurpur
984423633e Update bodybag.dm 
Added missing comment.
 2023-06-13 14:04:03 -07:00
FoxglovePurpur
6d067b6e70 Update blueprints_vr.dm 
Added missing comments.
 2023-06-13 14:02:41 -07:00
Razgriz
53bfa692a4 Merge pull request #6364 from Raeschen/patch-1 
Fix a merge conflict
 2023-06-13 13:58:33 -07:00
FoxglovePurpur
7cd7646f99 Update global_lists_vr.dm 
Added missing comment.
 2023-06-13 13:53:08 -07:00
Raeschen
ca19ab2abd Fix a merge conflict 2023-06-13 22:46:01 +02:00
Digi Purpur
da120bab14 GPS Text and Spelling Fixes 
The GPS on/off text was reversed and this fixes it. Along with a couple others. The largest "change" is the change of posessed to possessed (since it requires an actual file-name change.)
 2023-06-13 13:35:53 -07:00
Digi Purpur
3468c70ebf Foxtaur Squats 
GET THAT WORKOUT IN BB
 2023-06-13 12:21:02 -07:00