cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,606 Commits 5 Branches 0 Tags
6068fb44cd661ed6343e3254e00bda86489ba709
Commit Graph

1963 Commits

Author SHA1 Message Date
CHOMPStation2
4153768ba1 [MIRROR] Job rank and radio channel rework (#8965) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-17 21:24:13 +02:00
CHOMPStation2
2986497a43 [MIRROR] Revert "Revert "/tg/ preference datums part 1: take two"" (#8929) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-14 12:30:15 +02:00
CHOMPStation2
7425ef0b2c [MIRROR] Fear and Phobias (#8857) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-02 20:56:38 +02:00
tacoguy7765093
52b6b89a1e Fixes gun in-hand, changes default gun sound, adjusts gun sounds. (#8819) 2024-08-23 14:21:07 +02:00
tacoguy7765093
d3167feb2c Fixes a handful of weapons shooting the wrong projectile, phase weapon nerf, floragun buff, one merc nerf. (#8791) 2024-08-22 12:48:46 +02:00
CHOMPStation2
24658f4b9d [MIRROR] August 2024 various fixes (#8766) 
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2024-08-14 02:15:42 +02:00
tacoguy7765093
99830636d9 [READY] Walks back combat refactor, plus ammo balance changes (#8728) 2024-08-13 18:11:04 -04:00
Cadyn
abc16a2e2a The big ammo simplification (#8171) 2024-06-25 13:57:20 +02:00
Kashargul
0ab421aabe undefines our defines (#8506) 2024-06-09 18:58:36 +02:00
CHOMPStation2
15863e00f8 [MIRROR] Undefines local defines and moves global to __define (#8502) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-06-09 18:26:41 +02:00
Kashargul
80e08697a7 another case of update_icon in NEW (#8500) 2024-06-09 15:20:15 +02:00
Kashargul
e28fa96705 Tg panel patch 2 (#8085) 
Co-authored-by: Cadyn Bombaci <cadynspacetechguy@gmail.com>
 2024-05-15 13:42:13 +02:00
CHOMPStation2
244322e58d [MIRROR] some borg upgrade overhaul, power use function, bluespace pounce and some fixes (#8277) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-04-29 16:07:03 +02:00
Cadyn
985f3401a9 GC cleanup (#8211) 2024-04-11 07:48:37 +02:00
Cadyn
57a0b4a5eb minor fixes (#8209) 2024-04-11 07:47:16 +02:00
Guti
7c3fb6fb64 Maintenance Deck (#8146) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-04-07 08:25:38 +02:00
Raeschen
2e48d9419b Revert magazine sizes in combat refactor (#8033) 2024-03-23 10:28:34 +01:00
CHOMPStation2
39ab514759 [MIRROR] fixes broken chars (#7892) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-03-10 14:51:55 +01:00
Raeschen
05552c5c7a More runtimes (#7917) 2024-03-10 14:47:41 +01:00
Raeschen
e29b9d4d35 Reversions and fixes (#7889) 
Co-authored-by: Selis <selis@xynolabs.com>
 2024-03-06 18:20:29 +01:00
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
Cadyn
c79ad55ba8 Infraupgrade (#7670) 2024-02-15 03:22:50 -07:00
Selis
ab7c087902 Juke Build Update (#7708) 2024-02-09 18:40:21 +01:00
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -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
Missile597
1f904af89a Laser4 Fix (#7645) 
Co-authored-by: Changelogs <action@github.com>
 2024-01-28 21:30:09 -05:00
Aroliacue
213a952c4a Exploration Equipment Vendors and misc changes (#7616) 2024-01-28 18:25:39 -05:00
CHOMPStation2
b6eea9b639 [MIRROR] Raptor sprite overhaul (#7633) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-01-27 19:57:44 +01:00
Kashargul
c820b6f0e5 donking (#7571) 2024-01-17 22:02:40 -05:00
CHOMPStation2
6548bcd55c [MIRROR] Gives Altevian Slicer a better sound (#7555) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-14 18:32:26 -05:00
CHOMPStation2
4ea69d7301 [MIRROR] Adds altevian mineral slicer (#7521) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-07 18:26:42 -05:00
Guti
f32a21f36b Phase fixes (#7484) 2023-12-31 20:13:13 -05:00
FluffMedic
f320278b8d Trying to remove Mob Hardstuns (#7266) 2023-12-12 20:09:30 +01:00
Aroliacue
8dc3f411a2 Xenomorph Structure Icon Update + Misc Fixes/Improvements (#7336) 2023-12-06 21:31:18 +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
Aroliacue
aaff33e980 Curabitur Improvements, Belly Liquid Reagent Additions (#7284) 2023-11-29 16:23:04 +01:00
FluffMedic
08e7b6658b 1 real fix, two bandaid ones. (#7270) 2023-11-25 13:53:46 +01:00
Selis
aae9676187 [MIRROR-FIX] Upstream merge 15493 (#7178) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-11-07 13:34:51 +01:00
tacoguy7765093
c262e908b9 bandaid fixes some invisible guns (#7077) 2023-10-04 21:40:59 -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
CHOMPStation2
86fed82d17 [MIRROR] Remove all mention of nazis from code (#7000) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-18 18:07:17 +02:00
CHOMPStation2
dc189c0b16 [MIRROR] Killian's Grab Bag PR (#6880) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-29 17:30:20 +02:00
CHOMPStation2
ec735809c5 [MIRROR] A bunch of small fixes (#6820) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-16 09:46:36 +02:00
CHOMPStation2
51b73e8042 [MIRROR] [READY] Removes Dogborgs (#6763) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: kcin2001 <rnlb2001@gmail.com>
 2023-08-14 08:01:48 +02:00
TheGreatKitsune
8384f27582 Allow click-dragging things into rechargers (#6749) 2023-08-08 08:01:05 +02:00
Aroliacue
7368ed0071 [READY TO MERGE] Exploration Carrier Phase One, Phase Weapon Improvements and new Humvee Vehicle (#6360) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <rycoop29@gmail.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>
 2023-07-31 15:00:03 +02:00
Aroliacue
690596cbf8 C-20R rework, new wielded gun sprites 2023-07-14 17:33:51 +10:00
Aroliacue
efcaab7427 Merge branch 'master' into aro_firearms 2023-07-12 10:23:17 +10:00