cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,443 Commits 8 Branches 0 Tags
c3578b965869aa55b29fa8d10b7e35315b56375f
Commit Graph

386 Commits

Author SHA1 Message Date
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
CHOMPStation2
a8f1fa8f2a [MIRROR] Craftable Shelves (#8751) 
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-08-10 07:37:31 +02:00
Cadyn
cf1db3c049 Memory tracking shenanigans (#8359) 2024-05-15 16:56:31 +02:00
CHOMPStation2
c5d592fd77 [MIRROR] Fixes inconsistant material refunds and removes material cost from door repair (#8215) 
Co-authored-by: Reo Lozzot <84661000+ReoDaProtovali@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-04-17 09:34:18 +02:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CHOMPStation2
379e34217c [MIRROR] dismantle takes optional var (#7677) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-02-02 19:16:19 +01:00
CHOMPStation2
7f4274a2d8 [MIRROR] porting healthbars from roguestar + disassemble mat fixes (#7649) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-01-31 11:55:21 -05:00
CHOMPStation2
aab270c74f [MIRROR] remove static chat colour tags (#7635) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-29 18:45:19 -05:00
CHOMPStation2
fc584152e3 [MIRROR] we never want half or empty stacks (#7639) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-28 15:59: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
CHOMPStation2
2c6276cc8b [MIRROR] Graphite Table Material (#7456) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-12-21 23:11:41 +01:00
Aroliacue
8dc3f411a2 Xenomorph Structure Icon Update + Misc Fixes/Improvements (#7336) 2023-12-06 21:31:18 +01:00
CHOMPStation2
9a0a9ca329 [MIRROR] Hardwood Parquet (#7236) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-11-17 20:22:15 +01:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
Verkister
9583cd46fa Fixes cloth and fiber materials missing their sheet type definitions (#6945) 2023-09-10 09:48:24 +02:00
CHOMPStation2
1e0cbdc713 [MIRROR] Wall/Table Icon_Base Split (+hull plating creation) (#6933) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-08 14:11:17 +02:00
Aroliacue
807619a6bd Xenomorph Hybrids species (#6893) 2023-09-01 10:04:37 +02:00
CHOMPStation2
c3d1fd6128 [MIRROR] Staves (#6684) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-07-30 16:16:00 +02:00
Heroman3003
ee8c705e3a Merge pull request #15156 from Heroman3003/fluffstuff 
Fluff updates
 2023-07-18 05:21:35 +00:00
Heroman3003
e62d81af4b [MIRROR] the little construction pr 2023-07-07 07:30:36 +00:00
Casey
7b62bb9d2a Merge pull request #14617 from TheToaster98/ErisFloors 
Allows the crafting of Eris-style floors
 2023-03-08 19:07:31 +00:00
Heroman3003
7717c49c87 Merge pull request #14565 from Heroman3003/atuolaathe 
Fixes hull-made items putting hull materials in my autolathe
 2023-02-26 09:46:09 +00:00
Razgriz
fed8c75408 Fix plastic feeder recipe so that it isn't under sofas (#5610) 
* Fix plastic feeder recipee so that it isn't under sofas

* Update plastic_ch.dm

* god please
 2023-01-26 02:02:40 -07:00
Heroman3003
165d947e91 Fixes autolathe, material and smartfridge issues 2022-12-28 21:48:06 +00:00
Casey
e9c0b6ee31 Merge pull request #14087 from Heroman3003/mirro-fixes 
Fixes comfy chair recipies being removed by broken mirror
 2022-11-17 02:33:55 +00:00
Bib Bob
c854be9fae can I have a sheet on my bed 2022-11-05 18:51:20 -05: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
Razgriz
fa6ecc5cee Merge pull request #5004 from CHOMPStation2/upstream-merge-13467 
[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
 2022-09-22 22:10:59 -07:00
Razgriz
983fb72a3f powder that makes you say yes 2022-09-22 21:03:29 -07:00
Razgriz
69883123d9 powder that makes you say yes 2022-09-22 21:03:08 -07:00
VirgoBot
a3c824dcc8 [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED) (#13010) 
* Fixes directional overlays on padded comfy and rounded chairs

* Fixes mirror conflicts (#13411)

* Update chairs.dm

* Update chairs.dm

Co-authored-by: Cerebulon <tanhindmarsh@yahoo.com>
Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-23 01:08:46 +00:00
VirgoBot
4acf5e2e67 [MIRROR] conk rete (ABLE TO BE MERGED) 2022-09-23 01:03:49 +00:00
Casey
5c9f7b6b72 Merge pull request #13349 from Heroman3003/frame-parts 
Makes multiple frame parts makeable on same tile
 2022-07-17 09:32:41 +00:00
Novacat
ecf195e93d Merge pull request #13228 from Heroman3003/unbucket 
Removes wooden bucket recipe from planks
 2022-07-01 21:25:10 +00:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
ff911924b5 Merge pull request #12881 from TankTheBirb/master 
Pocket pouch rebalance + obtaining method
 2022-05-08 09:44:33 +00:00
Razgriz
28c173e92b revert morphium nerf 2022-04-10 13:26:26 -07:00
Casey
3f3a075f97 Merge pull request #12687 from Heroman3003/nerfnd 
Nerfs gravitons and morphium, adds lots of boards into autolathe
 2022-04-09 04:21:25 +00:00
Nadyr
59090266bd Merge pull request #3717 from CHOMPStation2/upstream-merge-12286 
[MIRROR] Merge Fixes for 8222
 2022-02-19 20:51:16 -05:00
Casey
592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
Casey
8bfa8b09ab Fixes sofa paths 2022-02-18 19:05:41 +00:00
Test Turtle
3c06b4dc19 Update to Sheet Materials 
While this doesn't revert all the changes upstream to the mining materials, it does replace most of them with sprites from other servers, which I feel are more appropriate here.
 2022-02-07 17:20:45 -08:00
Nadyr
4a94043fe9 powder that makes you say yes 2021-10-30 23:02:45 -04:00
Chompstation Bot
da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00
Chompstation Bot
4dd3ea4d15 Overhauls Resin ability, deletes unused xeno sprites, fixes few things. 2021-09-24 03:19:02 +00:00
Nadyr
679ecb0915 powder that makes you say yes 2021-08-27 20:24:36 -04:00
Nadyr
ef6bdcf608 powder that makes you say yes 2021-08-27 20:24:09 -04:00
Nadyr
6d41a6f8d6 powder that makes you say yes 2021-08-27 20:23:35 -04:00
Nadyr
e890164eb4 powder that makes you say yes 2021-08-27 20:22:37 -04:00
Nadyr
2e4d98fc0c powder that makes you say yes 2021-08-27 20:21:57 -04:00