cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,923 Commits 8 Branches 0 Tags
4540ee5b1b5a5860c109b6a125384d5d045ff28b
Commit Graph

93 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
4540ee5b1b [MIRROR] Woodstravaganza (#12049) 
Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-11-27 22:12:45 -05:00
CHOMPStation2StaffMirrorBot
5961af3835 [MIRROR] Adds a new redgate map: The Casino Canal (#11868) 
Co-authored-by: Ryumi <ghosttehspychecka@gmail.com>
Co-authored-by: C.L. <killer65311@gmail.com>
 2025-10-26 18:23:47 -04:00
CHOMPStation2StaffMirrorBot
ba1065b92e [MIRROR] clean up flags (Requires #11623 Merged First) (#11637) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-09-14 20:19:32 +02:00
Cameron Lennox
209934afa8 [MIRROR] Reduce Lists Memory usage, update CI (#10929) 2025-05-19 21:00:24 +02:00
CHOMPStation2
de9edb8d50 [MIRROR] Tech tile fixes (#8752) 
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-08-11 18:58:13 -04:00
Raeschen
623a2ee567 Allow carpet to be painted (#7604) 2024-01-21 14:35:39 +01:00
CHOMPStation2
a4280d14e1 [MIRROR] Many bug fixes, QoL, and PDA notes port (now with sensible diffs) (#7588) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Nadyr <forlirnglacignis@gmail.com>
 2024-01-19 09:26:26 -05:00
Nadyr
506661f8f4 Merge pull request #5919 from CHOMPStation2/upstream-merge-14551 
[MIRROR] [MIRROR] /tg/ era language pass
 2023-03-17 02:40:16 -04:00
Nadyr
8a693c6c71 powder that makes you say yes 2023-03-17 02:20:31 -04:00
Heroman3003
025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
Bib Bob
03b10bb961 moved code in a better spot 2023-03-09 23:35:02 -06:00
Bib Bob
829899a401 attempt to make this override only on sif grass 2023-03-09 23:09:41 -06:00
Bib Bob
6fed46173c plating on sif 2023-03-08 18:48:28 -06:00
Nadyr
065f38e1a4 powder that makes you say yes 2023-01-04 21:12:39 -05:00
Casey
94a2f6fd88 Brings Seasons to RP! 2023-01-04 21:08:44 -05:00
Nadyr
6d12be9af8 powder that makes you say yes 2023-01-04 20:37:38 -05:00
Casey
6f1fb55d0d Time for Seasons 2022-12-30 21:09:39 +00:00
Heroman3003
c502bad450 Merge pull request #14202 from VOREStation/upstream-merge-8859 
[MIRROR] Greenjoe12345/xmas2022
 2022-12-14 06:36:11 +00:00
Casey
bd67968cb8 talon, vb, and typhon fixes 2022-10-16 21:02:45 +00:00
Razgriz
cf301c6346 [Manual MIRROR] Release Bugfixes and changes (MERGE BEFORE RELEASE) 
Unfucks https://github.com/CHOMPStation2/CHOMPStation2/pull/5019 due to yet another github merge conflict with a god damn .dmi file. Missing map files, but that's ok because that's for virgo specific maps.
 2022-09-23 00:14:16 -07:00
VirgoBot
4acf5e2e67 [MIRROR] conk rete (ABLE TO BE MERGED) 2022-09-23 01:03:49 +00:00
Casey
dda05e9aa7 Lucky 7 Casino and Restaurant 2022-07-12 06:03:43 +00:00
Nadyr
5b75024c2f Merge branch 'master' into upstream-merge-13114 2022-06-22 21:47:19 -04:00
Casey
d4f8e75cd6 Adds Happy carpet 2022-06-19 03:59:10 +00:00
Casey
54279fa4de [MIRROR] Adds Some More Decorative Flooring Types 2022-06-19 00:44:42 +00:00
Casey
592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Chompstation Bot
ae737fe4a1 Add arcadey carpets 2021-07-29 20:10:19 +00:00
Aronai Sieyes
7ecbc25c97 Merge pull request #11035 from VOREStation/upstream-merge-8166 
[MIRROR] Cold cavern tileset.
 2021-07-12 06:41:16 +00:00
Chompstation Bot
0967736254 [MIRROR] Fixes sif forest grass, adds overgrowth tiles 2021-01-27 19:35:43 +00:00
Darlantan
a2f77d1eb1 Fixes Sif forest turfs 2021-01-24 11:02:43 -05:00
Verkister
7d408e9996 Merge pull request #9227 from VOREStation/upstream-merge-7714 
[MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
 2020-10-19 10:39:13 +00:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Atermonera
94e42939de Removes TURF)IS_FRAGILE from wooden flooring (#7515) 2020-08-16 23:54:08 -04:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Atermonera
f784011181 Dirt Fix 2020-06-20 01:02:00 -04:00
Darlantan
ffd1a43c4c Fixes Dirt 
Fixes dirt to use the correct declaration and removes the TURF_HAS_EDGES flag which causes error sprites to overlay on dirt turfs.
 2020-06-16 03:36:49 -04:00
BillyBangles
75901775a0 Adds marble floor tiles and crafting recipe (#7264) 
* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
 2020-06-06 14:36:25 -04:00
Aronai Sieyes
b8355dd464 Prevents lava from being blown up 2020-06-01 13:42:24 -04:00
Arokha Sieyes
1738b66b3c Be really specific about turf decal layers 2020-05-31 22:55:36 -04:00
Aronai Sieyes
6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
Aronai Sieyes
97d6799cb2 Move the flooring cache onto the flooring decls 2020-05-28 23:00:32 -04:00
Aronai Sieyes
ce3db722d7 Add is_plating feature to flooring 2020-05-28 11:42:27 -04:00
Aronai Sieyes
5c49b62326 Port various auto-decorating floors from Eris 2020-05-27 14:47:34 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Rykka
7c1556e11f Hotfix for edge failures, turf /edge/ rewrite on upstream, port later 2020-05-11 14:22:37 -04:00
Aronai Sieyes
9982367739 Fix two edge bugs with turfs 2020-05-11 13:46:45 -04:00
Aronai Sieyes
11ad1fc274 Merge pull request #7737 from Rykka-Stormheart/shep-dev-steppies 
Add footstep sounds to almost every single tile.
 2020-05-10 18:55:06 -04:00