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

3297 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
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CHOMPStation2
cbba031a7d [MIRROR] Size Toy Fun (#7727) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-02-11 21:52:51 +01:00
Selis
ab7c087902 Juke Build Update (#7708) 2024-02-09 18:40:21 +01:00
CHOMPStation2
2ec2899f22 [MIRROR] Ports various clothing items, two sets of cyberlegs & some markings (#7695) 
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-09 12:21:39 +01:00
CHOMPStation2
2878ad68de [MIRROR] adds 18th century oufit, ports fox ears, fixes 2 hairs (#7696) 
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-02-07 19:40:54 +01:00
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
FluffMedic
d6fae8b211 New Gateway: Destroyed Asteroid Mining (#7651) 2024-01-31 15:01:18 -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
Aroliacue
213a952c4a Exploration Equipment Vendors and misc changes (#7616) 2024-01-28 18:25:39 -05:00
CHOMPStation2
495411c4a4 [MIRROR] tanktop to loadout, yellow jacket to loadout (#7589) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2024-01-19 10:35:34 +01:00
Skits
e69037b8bc Fixes B&W tabards (#7562) 2024-01-15 17:19:42 -05:00
Aroliacue
4405418346 Xeno Voidsuit Sprite framework, balance adjustments and misc adjustments (#7464) 2023-12-23 22:14:22 +01:00
Aroliacue
412e7ebc83 Xenomorph Protean Suit 2, Gloves Readjustment (#7423) 2023-12-16 20:59:47 +01:00
CHOMPStation2
ddd5152508 [MIRROR] underwear & clothing sprite fixes + edits (#7408) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-12-13 09:50:25 +01:00
BlackMajor
92c744dfec Event stuff, but also Squeak component (#7285) 2023-12-11 14:40:47 +13:00
Aroliacue
8dc3f411a2 Xenomorph Structure Icon Update + Misc Fixes/Improvements (#7336) 2023-12-06 21:31:18 +01:00
CHOMPStation2
a4f5f51da3 [MIRROR] porting extravanganza - hair, clothes + 1 tail (#7340) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-12-06 21:04:13 +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
WinterDarkraven
2250575937 Adds "Holographic Demonic Halos" (#7258) 2023-11-24 00:00:37 +01:00
TheGreatKitsune
4a34090ac6 Fix vox engineering/sec rigsuits (#7218) 2023-11-14 11:45:38 +01:00
Selis
2ba38d60af [MIRROR-FIX] Upstream merge 15464 (#7176) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-11-07 13:33:44 +01:00
CHOMPStation2
38984e8ef3 [MIRROR] VerySoft Fluff Item! (#7133) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-25 20:13:25 -04:00
CHOMPStation2
3663946898 [MIRROR] Altevian Adjustments - Descriptions & Small Tweaks (#7072) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:58:54 -04: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
ccb4aad376 Slow digestion for food items, Swoopie succ overhaul, and a couple other fixes. (#7029) 2023-09-26 15:48:01 +02:00
Aroliacue
f1f05f09d0 Holster and Vest Availability (#6935) 2023-09-10 09:59:33 +02:00
CHOMPStation2
0ec772f73b [MIRROR] Bluespace Collars (#6951) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-10 09:55:21 +02:00
CHOMPStation2
a971e0e933 [MIRROR] Fixes xenochimera body base suits (#6948) 
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-09-10 09:50:30 +02:00
Razgriz
d52dc4bd84 Fix shiny modular clothes and adds a bunch of fun items to hidden crate on deck 2 (#6918) 2023-09-04 10:32:53 +02:00
Aroliacue
9eb6ca21e1 More Skinsuits (#6900) 2023-09-02 16:47:17 +12:00
CHOMPStation2
ddfecf05e6 [MIRROR] 3 edited outfits (#6857) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-23 14:35:23 +02:00
CHOMPStation2
c0dc39dd55 [MIRROR] A variety of fixes (#6843) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-20 09:20:55 +02:00
CHOMPStation2
c993c26f84 [MIRROR] Fixes holstering micros (#6762) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-10 23:11:39 +02:00
Purdev
54ca538149 Various Changes (#6690) 2023-07-31 15:08:13 +02:00
CHOMPStation2
c81bf0ee4a [MIRROR] Recolourable fingerless gloves (#6674) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-07-30 08:18:32 +02:00
Raeschen
071905fed5 Fix lost changes (#6633) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
 2023-07-21 08:44:40 +02:00
Heroman3003
ee8c705e3a Merge pull request #15156 from Heroman3003/fluffstuff 
Fluff updates
 2023-07-18 05:21:35 +00:00
Seris02
0167bcc53d taur coat fix 2023-07-03 12:53:51 +08:00
Raeschen
277299d956 Update miscellaneous.dm merge conflicts 2023-07-02 15:35:55 +02:00
Heroman3003
f4ec2e5922 ports some clothing from citadel rp + 2 hairs & 2 gradients from skyrat 2023-07-01 20:25:47 +00:00
Raeschen
5e8b9b744e no armor in loadout 2023-06-28 13:36:51 +02:00
Raeschen
d66c728f05 add tacticool turt to loadout, give sensors 2023-06-28 13:22:45 +02:00
Heroman3003
7162053d20 Merge pull request #15085 from Heroman3003/classic-hardhat 
Brings classic hard hats as alternate option
 2023-06-26 20:20:27 +00:00
Raeschen
d328659139 More clothing.dm chompedit reapplications 2023-06-22 11:00:56 +02:00
Raeschen
ed5332fe13 resync, reinclude chomp edits 2023-06-22 10:56:20 +02:00
Raeschen
329fabee96 Clothing.dm huge conflict 2023-06-22 10:50:37 +02:00
Heroman3003
29ca579ab8 Implements Climbing 2023-06-21 19:22:02 +00:00
Heroman3003
793e293ccc Merge pull request #15055 from Runa-Dacino/bugfixes 
fix(accessory): Fixes IAA badge permissions
 2023-06-20 20:49:17 +00:00
Raeschen
9ae31e501e Merge pull request #6411 from CHOMPStation2/upstream-merge-15043 
[MIRROR] Spell Fixes
 2023-06-19 12:42:37 +02:00