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

9569 Commits

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
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
Selis
2a6d65a6d4 Comments out include 2023-06-16 19:39:48 +02:00
Nadyr
812e3b85ab Merge pull request #6300 from CHOMPStation2/upstream-merge-14943 
[MIRROR] Modifies scug picnic to use picnic blanket, makes it more aesthetically pleasing
 2023-06-09 21:47:14 -04:00
Nadyr
088d87cb57 Merge pull request #6293 from CHOMPStation2/upstream-merge-14931 
[MIRROR] Items for the Plant People (not the literal plant people)
 2023-06-09 21:45:16 -04:00
Razgriz
1a5d27a80b Merge pull request #6321 from FluffMedic/Cultist 
Fixing an area/space
 2023-06-04 16:26:58 -07:00
Fluff
ceb99b32e7 Also fixes a mistake 
The mining satchel of holding was meant to be a pouch of holding.
 2023-06-04 19:26:05 -04:00
Fluff
0ef7dec557 Fixing an area/space 
Title
 2023-06-04 18:43:32 -04:00
Kassc
221eebc2df Merge pull request #6295 from FluffMedic/Cultist 
Alt Version Of Deep Wilds POIs
 2023-06-04 14:29:10 -04:00
Heroman3003
000a9e3989 Merge pull request #14943 from Runa-Dacino/scugpicnic_p2 
Modifies scug picnic to use picnic blanket, makes it more aesthetically pleasing
 2023-06-03 09:20:57 +00:00
Fluff
26756f33e2 Alt Version Of Deep Wilds POIs 
Adds some alternate versions of some Deep Wilds POIs. Whether some mobs are swaped out, locations swapped, terrain altered, intended path changed, etc.
 2023-06-02 12:15:22 -04:00
Heroman3003
d41519dcb8 Items for the Plant People (not the literal plant people) 2023-06-02 01:22:32 +00:00
Kassc
e30560844f Merge pull request #6229 from VictorZisthus/sc-updates-may2023-2 
Minor map fixes
 2023-06-01 19:58:08 -04:00
Kassc
4e87a724ff Merge pull request #6255 from FluffMedic/Cultist 
Cult POI altering, and some minor fixing
 2023-06-01 19:56:34 -04:00
Heroman3003
df9b265e49 Merge pull request #14917 from Burrito-Justice/master 
New Event Site: The Falls
 2023-05-30 20:22:04 +00:00
Fluff
c78e1536b3 Cult POI altering, and some minor fixing 
-Added bellies to teshari cultists.
-Reworked the cult bar and moved it to the valley.
-Replaced some walls of the blood church with cult walls, and reduced the number of artificer.
-Reduced some teshari for Cliff Manor
-Added DIRT. Much Dirt.
-Removed one wraith from the settlement POI.
-DoomP's armory is shifted but is not as well staffed.
-Removed a staff of focus and added a spellbook in it's place.
-Fixed the Behemoth and the Aegis hopefully.
 2023-05-27 10:11:35 -04:00
Victor Zisthus
d0731aac1b Miner map fixes 
Z2

Fixes missing atmos vents and scrubbers in Research server room.

Fixes Atmos custom mix input and output.

Adds ShieldGen bypass breaker boxes.
 2023-05-22 04:59:57 -04:00
Victor Zisthus
b35979eae5 Tinyfan-B-Gone 
NEW ATMOS SHIELDS LET'S GOOOOOO!!!!

Also adjusted the power generator to compensate while still causing power issues if not properly handled!
 2023-05-19 19:12:30 -04:00
Victor Zisthus
3ed4ee5fab General Map Updates & Fixes 
Z1
Fixed lights.
Fixed a wrong color sofa.
Fixed missing access on an Airlock.
Nonan left a present in a secluded area! His FAVORITE plant!

Z2
Adjusted target pressure on Waste Loop to a more universal value. It still stays stuck closed at roundstart.

Z7
Fixed Engineering/Atmos not having access to the Explo carrier to fix breaches.

Z10 + 12
Overhauled wilderness shelter again.
 2023-05-19 18:45:52 -04:00
Aroliacue
382eeec503 Adds shield generators to cargo and explo/mining vendors 2023-05-12 21:41:30 +10:00
Aroliacue
134088c3ab Merge branch 'CHOMPStation2:master' into Aro_mapchanges 2023-05-12 21:02:57 +10:00
Nadyr
54548bde71 Merge pull request #6186 from TheGreatKitsune/shadekin-fixes 
Adds extra limit to shadekin abilities and fixes other issues
 2023-05-11 18:46:15 -04:00
TheGreatKitsune
f8b5502441 Adds extra limit to shadekin abilities and fixes other issues 2023-05-10 16:06:16 -05:00
Nadyr
1a14cd26ed Merge pull request #6173 from FluffMedic/MoreFixing 
Makes some exposed tiles match the outside
 2023-05-08 15:10:15 -04:00
Aroliacue
257c7d36f0 Adds Virgo Shield Belts and Injector Makers to Southern Cross 2023-05-08 20:18:53 +10:00
Fluff
e509a75704 Got the temp 
Tempature changes
 2023-05-05 14:11:37 -04:00
Fluff
ed253acb8c I do not like this things. 
Why is there a diffrence of 1 mole.
 2023-05-02 20:09:28 -04:00
Fluff
23f1684a11 Makes some exposed tiles match the outside 
For the following POI, cliffmanor, fallenportal, leechpond, puzzledungeon, matches the outside tiles to the oxygen and nitrogen levels of sif tiles. Side note, active edge errors, I hate all of you.
 2023-05-02 17:52:10 -04:00
Verkister
c9e7649802 also fixes xenoarch active edges 2023-05-02 22:36:45 +03:00
Verkister
1b5394baa1 Bunch of active edge fixes 
Fixes active edges on several POIs, including dug out mercs, derelict engine, eclipse lava, eclipse dig, and demon ranch.
 2023-05-02 22:25:30 +03:00
Kassc
37b11354a8 Merge pull request #6153 from FluffMedic/INeedSleep 
Fixing some minor things #Lizzard
 2023-04-30 20:30:11 -04:00
Nadyr
973030bd20 Merge pull request #5706 from FluffMedic/Valley 
Wilds Expansion - The Valley
 2023-04-30 03:18:14 -04:00
BlackMajor
e3c6d74ffd Done and dusted 2023-04-30 15:49:35 +12:00
BlackMajor
05e2a55843 test 2023-04-30 14:29:11 +12:00
Fluff
0fb37f5088 Fixing some minor things #Lizzard 
Removed the double toilet in in the 3rd deck giant bathroom. As in the two toilets in the same space.
Swapped the escape pod nanomeds for emergency medical wall lockers, because of the malfunction machine event.

And removed the random space tile in restaurationbar.
 2023-04-28 13:57:20 -04:00
Kassc
fdf7d783ee Merge pull request #6011 from FoxglovePurpur/purdevmapping 
Library Cafe Changes
 2023-04-25 22:25:06 -04:00
Heroman3003
d85bf59b5e One-way conveyor switches 2023-04-20 06:14:54 +00:00
Razgriz
4e89b8eff9 Merge pull request #6114 from FluffMedic/BrokenStation 
Fixed double cyborg charger
 2023-04-18 06:45:13 -07:00
Fluff
2215977e3c Adding a fix to the HoS's open door button 
Adding a fix to the HoS's open door button to this PR too.
 2023-04-17 21:34:30 -04:00
Fluff
2d24802dd4 Fixed double cyborg charger 
Fixes the double cyborg charger.
 2023-04-17 21:01:53 -04:00
Nadyr
ba025f9d8d Merge pull request #6111 from FluffMedic/BrokenStation 
Fixing non-functioning emergency shutters
 2023-04-16 21:22:42 -04:00
Fluff
6088c8e887 Fixing this random emergency shutters that didn't function 
There was a row of emergency shutters that wouldn't function properly, mostly because there wasn't a complete line. Will close if this is intended.
 2023-04-16 18:48:20 -04:00
Fluff
b721543010 Added some decor. 
Added some decoration
 2023-04-16 08:38:17 -04:00
Nadyr
9d53565799 Merge pull request #6072 from Verkister/garbobutton 
Couple more recycling tweaks
 2023-04-15 21:11:23 -04:00
Fluff
c135cd0678 Fixing Dorm 2 Lights 
Adds a light switch to dorms 2.
 2023-04-11 18:20:52 -04:00