cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,266 Commits 9 Branches 0 Tags
893b4e2ac07aaae3fa2e456def03e8d2f2636c9d
Commit Graph

133 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
893b4e2ac0 [MIRROR] converts area booleans to flags (#9595) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-08 15:57:55 +01:00
CHOMPStation2StaffMirrorBot
7131e4602e [MIRROR] Barista love (#9591) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-08 15:22:08 +01:00
CHOMPStation2StaffMirrorBot
6c05f5da45 [MIRROR] Better Viro (#9421) 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-07 00:45:37 +01:00
CHOMPStation2StaffMirrorBot
040cbbe106 [MIRROR] Emergency door release (#9413) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
 2024-11-05 08:06:35 +01:00
Selis
026253a175 upstream-merge-16484 [MDB IGNORE] (#9289) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-25 21:39:18 +02:00
ShadowLarkens
21b3305c29 Add bapi-dmm, a rust maploader that goes BRRRRRRR (#9201) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-20 14:20:02 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
CHOMPStation2
064e840427 [MIRROR] Facility Redgate Map (#8484) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-06-04 01:16:24 +02:00
CHOMPStation2
8a216d58a1 [MIRROR] Entrepreneur Expansion Part 2 (#8313) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
 2024-04-26 08:07:59 +02:00
CHOMPStation2
f49be853cc [MIRROR] Jungle Redgate and New Vore Mobs (#8178) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-04-07 08:27:59 +02: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
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
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
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
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
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
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
Casey
e2fb4081d0 Medical Guidance 2023-07-04 23:21:27 +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
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
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
Heroman3003
d41519dcb8 Items for the Plant People (not the literal plant people) 2023-06-02 01:22:32 +00:00
Heroman3003
a4072d405e More space creature events 2023-04-02 20:23:37 +00:00
Casey
1138ab35fe Speed and stuff 2023-03-21 21:50:18 +00:00
Casey
4273cca010 Merge pull request #14591 from Runa-Dacino/scugpicnic 
Adds new POI to RP, creates scug spawner object
 2023-03-08 19:07:40 +00:00
Heroman3003
24e829b6a4 Adds new machine that mass-produces autoinjectors, maps it in 2023-02-18 19:09:36 +00:00
Casey
6600f25231 Merge pull request #14395 from Heroman3003/wl-fixes 
Adjustments to wildlife event
 2023-01-29 21:28:51 +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
Casey
8658910087 fixes RP seasonal subtypes and adds seasonal water 2023-01-08 20:37:51 +00:00
Nadyr
6a537e3c0f Merge branch 'master' into upstream-merge-14294 2023-01-04 21:46:39 -05:00
Nadyr
265cf3c967 Merge branch 'master' into upstream-merge-14294 2023-01-04 21:09:02 -05:00
Casey
94a2f6fd88 Brings Seasons to RP! 2023-01-04 21:08:44 -05: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
Casey
63c49c4e90 Replaces RP's carp, drone and jellyfish events with new Roaming Wildlife event 2023-01-03 21:56:23 +00:00
Heroman3003
c26d10f224 Merge pull request #14271 from Novacat/nova-basicfixes 
Miscallaneous Tweaks
 2022-12-30 21:06:28 +00:00
Heroman3003
21b9d0e636 Adjusts events and refactors borgs a bit in process 2022-12-30 21:05:11 +00:00