cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,114 Commits 10 Branches 0 Tags
ddc54ac3b4433d6a5c9fb434f14b54a1d6271985
Commit Graph

61 Commits

Author SHA1 Message Date
CHOMPStation2
ddc54ac3b4 [MIRROR] Adds a seagull (#6821) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-16 09:49:11 +02:00
CHOMPStation2
576064f7de [MIRROR] Fixes entertainment monitor icons missing on some maps (#6781) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-14 08:15:59 +02:00
CHOMPStation2
462db08fff [MIRROR] Stardog (#6718) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-06 00:24:31 +02:00
Raeschen
e7a564ac15 Update _debrisfield.dm 2023-07-06 22:50:04 +02:00
Casey
568d1fed14 Adds new Debris Field POI: Phoron Tanker! 2023-07-05 22:28:58 +00:00
Raeschen
3e0a0c0c98 big resync + merge conflicts 2023-07-05 10:12:39 +02:00
Casey
19550009ce Tweaks and tidying 2023-07-03 10:24:10 +00:00
Casey
048ffe5b4e Merge pull request #14710 from Heroman3003/ambiencertfx 
Fixes ambience runtime
 2023-03-18 21:01:39 +00:00
Heroman3003
4a44fb90ab Creates framework for renaming visitable overmap objs on initialization 2023-03-14 19:30:04 +00:00
Heroman3003
6b5a73d2da Merge pull request #14257 from Heroman3003/varios-fixes 
Various minor fixes
 2022-12-28 05:02:08 +00:00
Casey
416a52bbe9 Merge pull request #13827 from VOREStation/Mining-Bugfix 
Mining bugfix
 2022-10-02 17:59:53 +00:00
Casey
1550c3bee5 Mining adjustments 2022-09-25 20:47:34 +00:00
Casey
734d22329e Nerfs mining yields for SD and RP 2022-08-14 05:44:47 +00:00
Nadyr
46ff42c250 Merge pull request #4371 from CHOMPStation2/upstream-merge-13103 
[MIRROR] [MIRROR-FIX] Cooking QOL V2
 2022-06-22 21:55:19 -04:00
Novacat
47c92f2581 [MIRROR-FIX] Cooking QOL V2 2022-06-18 14:45:56 +00:00
Casey
460398845b Merge pull request #13098 from Very-Soft/fenning 
Fenfix
 2022-06-18 00:23:54 +00:00
Casey
61ea8e3f3d New Donk-pockets 2022-04-06 02:12:51 +00:00
Casey
ca774a5795 Catslugs & Access; a tale of securing sensitive items. 2022-04-04 20:01:24 +00:00
Razgriz
afe1c4c763 Merge pull request #3954 from CHOMPStation2/upstream-merge-12561 
[MIRROR] SD - V2 aerostat xenobio cell (no affect on chompstation)
 2022-03-31 00:45:09 -07:00
Casey
f3b1da2c1b SD - V2 aerostat xenobio cell 2022-03-29 06:02:07 +00:00
Casey
a1a389a571 Adds a new catslug, Miros, to the fuel depot 2022-03-27 19:20:09 +00:00
Casey
92bf95ef09 Merge pull request #12371 from PastelPrinceDan/aerostatfix 
SD - adds an exotic particle harvester to the V2 sci outpost
 2022-03-04 19:43:48 +00:00
Casey
2916cd9f91 Miscelanious map tweaks 2022-02-26 17:40:19 +00:00
Nadyr
2b45c4428a powder that makes you say yes 2022-02-19 19:00:31 -05:00
Casey
8bfa8b09ab Fixes sofa paths 2022-02-18 19:05:41 +00:00
Nadyr
e1415c9fb7 Merge pull request #3292 from CHOMPStation2/upstream-merge-11983 
[MIRROR] Fixes the ERT Ship
 2021-12-12 06:34:11 -05:00
Nadyr
9054c44fea powder that makes you say yes 2021-12-12 02:23:55 -05:00
Casey
f779dae42f Fixes vacuum in beachcave PoIs 2021-12-09 22:25:42 +00:00
Casey
9364bd666a Merge pull request #11983 from Novacat/nova-basicfixes 
Fixes the ERT Ship
 2021-12-08 04:16:54 +00:00
Nadyr
966e0cba44 Merge pull request #3208 from CHOMPStation2/upstream-merge-11941 
[MIRROR] v2 science outpost rework
 2021-12-05 13:40:12 -05:00
Nadyr
db3ef9440e Merge pull request #3217 from CHOMPStation2/upstream-merge-11921 
[MIRROR] Snakes are Sweet
 2021-12-05 13:28:39 -05:00
Nadyr
72481c548e powder that makes you say yes 2021-12-05 12:43:57 -05:00
Novacat
08bf60882f Active Edge Hunt Part 5 - Revelation 2021-12-03 07:17:10 +00:00
Casey
a1fabbfaa1 Snakes are Sweet 2021-12-03 07:15:09 +00:00
Casey
549e523b3b v2 science outpost rework 2021-12-03 07:12:51 +00:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Rykka
2c6a698f00 Re-save Fuel Depot in TGM mode. (For Github Reading) 2021-09-03 17:24:29 -07:00
Rykka
f57efd4ed0 Fixes two compiler warnings thanks to help from Razgriz! 
Fueldepot + Proteans. <3
 2021-09-03 17:24:29 -07:00
Razgriz
a53dc5fc80 Merge branch 'master' into OvermapPOI 2021-08-12 20:19:08 -07:00
Razgriz
04767aa9f1 Add fuel depot to overmap 
Adds fuel depot to overmap. Its location will change in the future.
 2021-08-12 20:17:51 -07:00
Aronai Sieyes
73b6e8b900 Merge pull request #11250 from VOREStation/Arokha/fueldepot 
Fix missing fueldepot overmap icon
 2021-07-26 13:31:42 +00:00
Nadyr
62cc1bc89d Merge pull request #2615 from CHOMPStationBot/upstream-merge-11181 
[MIRROR] Add art possibility to Virgo 2 surface outpost
 2021-07-20 20:41:59 -04:00
Aronai Sieyes
442c888d5e Merge pull request #11181 from VOREStation/Arokha/farpaint 
Add art possibility to Virgo 2 surface outpost
 2021-07-20 21:30:04 +00:00
Aronai Sieyes
66669af98d Merge pull request #11170 from Heroman3003/thepurge 
Finishes purge of Industrial Expansion
 2021-07-20 14:46:30 +00:00
Chompstation Bot
8b91a9ad50 Add a mapped-in outpost on Virgo 2 2021-07-19 21:17:09 +00:00
Chompstation Bot
877b582a85 Replace all the overmap icons 2021-07-03 20:34:03 +00:00
Aronai Sieyes
2d4853ca4f Merge pull request #10310 from Novacat/nova-pathfinder 
Mecha Balance and Fighter Fixes
 2021-05-15 17:17:36 +00:00
Novacat
866824fa85 Merge pull request #10280 from VOREStation/Arokha/multiore 
Allow more than one ore processor
 2021-05-11 13:06:25 +00:00
Chompstation Bot
08534fd4a7 Minor Fixes 2021-05-01 01:22:56 +00:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00