cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 09:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,111 Commits 8 Branches 0 Tags
b90f7ec922fab98166ddb6471619ef181894de38
Commit Graph

2561 Commits

Author SHA1 Message Date
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +01:00
CHOMPStation2
65113c9809 [MIRROR] Quick fix for planetary lighting on open space (#7818) 
Co-authored-by: BlackMajor <henrydyer6@hotmail.com>
 2024-02-24 13:12:27 +01:00
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
CHOMPStation2
6070a7f41f [MIRROR] Moves Falls map to Redgate, deletes Atoll (#7590) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2024-01-23 20:46:46 -05:00
CHOMPStation2
c30dacf3ab [MIRROR] ignore bellied in appendicitis events (#7520) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-07 18:24:34 -05:00
CHOMPStation2
88ef31d208 [MIRROR] borg privacy in droms (#7504) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-04 17:18:28 -05:00
CHOMPStation2
76e5fedd73 [MIRROR] Medbay Entry Revamp v2 (#7457) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-21 23:11:10 +01:00
CHOMPStation2
7077aea4d4 [MIRROR] Two minor fixes (#7459) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-21 23:10:43 +01:00
CHOMPStation2
9a065ff40a [MIRROR] Medbay Entry Revamp (#7391) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-10 19:15:19 +01:00
CHOMPStation2
bec46d23b9 [MIRROR] Protean Reconstitutor (#7320) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-03 13:20:23 +01:00
CHOMPStation2
4667401397 [MIRROR] Redgate Laserdome (#7319) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-03 12:54:20 +01:00
CHOMPStation2
7ad610070d [MIRROR] Fixes telecomms having too much access (#7208) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-11-12 12:26:57 +01:00
CHOMPStation2
507879aef8 [MIRROR] Fantasy redgate map (#7035) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-26 16:29:35 +02:00
CHOMPStation2
a4287d1c23 [MIRROR] More wires! (#6978) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-18 17:36:31 +02:00
CHOMPStation2
26b8e86ca9 [MIRROR] Map tweaks! (#6973) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-18 17:09:30 +02:00
CHOMPStation2
58891b3e78 [MIRROR] Changes blood regen pill instances to contain copper pills due to zorren copper update (#6958) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
 2023-09-12 23:19:36 +02:00
CHOMPStation2
10c8dcad3c [MIRROR] Redgate train map (#6932) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-08 14:10:26 +02:00
CHOMPStation2
afe5239781 [MIRROR] Adds Entrepreneur job, as well as new Entertainer alt-title (#6898) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-01 10:18:27 +02:00
CHOMPStation2
84bc06d121 [MIRROR] New redgate Islands map (#6889) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-31 10:46:14 +02:00
CHOMPStation2
1c8f42ed8f [MIRROR] Rain City (#6860) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-23 15:21:08 +02:00
CHOMPStation2
4d3358bea2 [MIRROR] Offmap housecleaning (#6819) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-16 09:46:17 +02:00
CHOMPStation2
f2abc54a3a [MIRROR] Fixes disposal pipe to chemistry on Tether (#6807) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-15 08:00:41 +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
41758bad6f [MIRROR] Tether Cargo Remodel (#6734) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-06 09:21:14 +02:00
CHOMPStation2
04857c569e [MIRROR] hotsprings (#6727) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-06 01:05:36 +02:00
CHOMPStation2
eb68ea1645 [MIRROR] OM mob related tweaks (#6730) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-06 01:05:16 +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
Heroman3003
e638b02327 Merge pull request #15147 from Heroman3003/homogenized-fish 
Adds generic 'spacefish migration' event, replaces active fish events with it
 2023-07-16 01:06:40 +00:00
Raeschen
2f18685407 Merge pull request #6500 from CHOMPStation2/upstream-merge-15109 
[MIRROR] Medical Guidance
 2023-07-05 12:42:18 +02:00
Casey
e2fb4081d0 Medical Guidance 2023-07-04 23:21:27 +00:00
Casey
19550009ce Tweaks and tidying 2023-07-03 10:24:10 +00:00
Raeschen
0563e27be0 resync upstream maps for ease 
not used, doesn't matter
 2023-06-27 13:32:14 +02:00
Casey
963d19aaf0 Ranch 2023-06-26 04:43:04 +00:00
Raeschen
5b48c89c8c more typepath changes 2023-06-21 08:53:10 +02:00
Raeschen
a84c8d268c maps pls 2023-06-21 08:46:11 +02:00
Heroman3003
ed323a6950 fix(repath): Fixes ore satchels from picking up BS crystals 2023-06-20 20:49:12 +00:00
Heroman3003
d41519dcb8 Items for the Plant People (not the literal plant people) 2023-06-02 01:22:32 +00:00
Heroman3003
d85bf59b5e One-way conveyor switches 2023-04-20 06:14:54 +00:00
Nadyr
cb7e20423d Merge pull request #6022 from CHOMPStation2/upstream-merge-14747 
[MIRROR] More space creature events
 2023-04-02 20:05:04 -04:00
Heroman3003
a4072d405e More space creature events 2023-04-02 20:23:37 +00:00
Heroman3003
7ea6b2ce9e Makes the tether trash rat into real boy/girl/creature 2023-04-02 20:23:20 +00:00
Casey
1138ab35fe Speed and stuff 2023-03-21 21:50:18 +00:00
Heroman3003
24e829b6a4 Adds new machine that mass-produces autoinjectors, maps it in 2023-02-18 19:09:36 +00:00
Nadyr
527fc4dacc Merge pull request #5595 from CHOMPStation2/upstream-merge-14368 
[MIRROR] Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly
 2023-01-27 10:30:21 -05:00
Razgriz
6e4c340437 Merge branch 'master' into upstream-merge-14234 2023-01-24 17:23:08 -07:00
Casey
e5a0753e45 Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly 2023-01-22 18:37:22 +00:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Nadyr
00edc849b5 Merge pull request #5479 from CHOMPStation2/upstream-merge-14269 
[MIRROR] Adjusts events and refactors borgs a bit in process
 2023-01-04 20:45:00 -05:00
Nadyr
5a5fa0a23d Merge pull request #5482 from CHOMPStation2/upstream-merge-14271 
[MIRROR] Miscallaneous Tweaks
 2023-01-04 20:36:41 -05:00
Heroman3003
c26d10f224 Merge pull request #14271 from Novacat/nova-basicfixes 
Miscallaneous Tweaks
 2022-12-30 21:06:28 +00:00