cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 02:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 7 Branches 0 Tags
0914aad76576b6a6be5626455be13f73b0449b51
Commit Graph

311 Commits

Author SHA1 Message Date
MeepleMuncher
734d93f841 Dragon Plushies! Part Deux (#8408) 2024-05-19 00:50:44 +02:00
MeepleMuncher
8a4956ae9a Dragon Plushies! (#8371) 2024-05-12 16:23:29 +02:00
CHOMPStation2
92021d0dc7 [MIRROR] Adds Contaminant Detector HUD (#8368) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-05-12 16:22:29 +02:00
CHOMPStation2
3cc86ae5ad [MIRROR] Maint Pred Availability (#8200) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-04-11 07:57:05 +02:00
Reo Lozzot
2ec2879552 Makes masks use their original, opaque sprite and properly implements polaris clear gasmask subtypes (#8113) 2024-04-04 19:56:48 +02:00
Raeschen
a0de22a1fc vscode use dmieditor, landmine sprite fix (#7869) 2024-03-02 14:16:50 +01:00
CHOMPStation2
b90eec23e2 [MIRROR] Spider (#7545) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-01-14 13:29:28 +01:00
tacoguy7765093
59748b443b Removes the pulse rifle from explo loot spawns (Plus dark fix) (#7526) 2024-01-08 16:43:29 -05:00
CHOMPStation2
c5ba4eb7a1 [MIRROR] Energy drinks (#7458) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-12-29 20:03:11 -05:00
CHOMPStation2
4cc6ae3d01 [MIRROR] Desatti vending machine (#7156) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-11-05 02:31:20 -05:00
Razgriz
051c754727 Remove Among Us slugcat (#6794) 
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 19:30:17 -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
89699242db [MIRROR] Updates to fantasy redgate (#7043) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-09-26 16:51:56 +02: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
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
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
20da89c88f [MIRROR] ports blahaj (#6866) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2023-08-25 08:58:36 +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
Raeschen
2a4d78bb47 Merge pull request #6342 from FluffMedic/craft 
Chemistry Update
 2023-07-13 14:58:30 +02:00
Aroliacue
31bb617dc9 P90K Revamp 2023-07-12 07:39:22 +10:00
FluffMedic
32b912469d Merge branch 'CHOMPStation2:master' into craft 2023-07-11 13:49:26 -04:00
Casey
19550009ce Tweaks and tidying 2023-07-03 10:24:10 +00:00
FluffMedic
2a43353d18 Merge branch 'master' into craft 2023-06-20 15:26:56 -04:00
Raeschen
3a8f28c2c5 Merge pull request #6351 from CHOMPStation2/upstream-merge-14961 
[MIRROR] "Hey bud, need a light?"
 2023-06-17 23:09:05 +02:00
Nadyr
8280d28d5f Merge pull request #6311 from CHOMPStation2/upstream-merge-14821 
[MIRROR] 2023 EnerGen Power Cells
 2023-06-09 22:23:14 -04:00
Heroman3003
fa4fff0a4c Merge pull request #14961 from Youtubeboy139/Lighters_&_cigs 
"Hey bud, need a light?"
 2023-06-09 22:43:24 +00:00
Fluff
540900d878 Fix some things 
Fixed some errors
 2023-06-08 23:34:06 -04:00
Fluff
d99e728bbb Chemistry Update 
Alright added more chems and stuff for explorery and minery folks to bring back to station
 2023-06-08 17:07:52 -04:00
Heroman3003
e24b0b016c Merge pull request #14821 from Youtubeboy139/2023-EnerGen-Power-Cells 
2023 EnerGen Power Cells
 2023-06-03 19:09:44 +00:00
Heroman3003
b37a023823 Merge pull request #14912 from Youtubeboy139/Thaler-Change 
It's all bout that Money Money Money
 2023-06-01 20:36:54 +00:00
Heroman3003
f0a0c6d506 Merge pull request #14880 from Youtubeboy139/Take-me-out-to-the-Ball-Game 
Take me out to the Ball Game
 2023-05-25 02:12:54 +00:00
BlackMajor
e3c6d74ffd Done and dusted 2023-04-30 15:49:35 +12:00
Heroman3003
d10da6fb22 Merge pull request #14767 from KillianKirilenko/kk-shockmaul 
Concussion Maul
 2023-04-14 22:38:34 +00:00
Heroman3003
d2543ddf47 Merge pull request #14678 from KillianKirilenko/kk-talontweaks 
Frozen Organ Crates
 2023-03-17 21:05:28 +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
Seris02
c121d589c8 resolve it 2023-02-26 18:21:49 +08:00
Heroman3003
d13fc550dc adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 09:46:20 +00:00
Nadyr
60c6d78cca Merge pull request #5152 from CHOMPStation2/upstream-merge-13924 
[MIRROR] [MIRROR] speculative fix for obj/random's not being deleted
 2022-10-19 17:15:39 -04:00
Nadyr
bc7ece8d95 Merge pull request #5147 from CHOMPStation2/upstream-merge-13916 
[MIRROR] [MIRROR] Fixes overlooked invisible spawner when mapping
 2022-10-19 17:13:24 -04:00
Casey
f5a847464c Merge pull request #13924 from VOREStation/upstream-merge-8752 
[MIRROR] speculative fix for obj/random's not being deleted
 2022-10-16 21:10:01 +00:00
Casey
aaef0c5556 Merge pull request #13916 from VOREStation/upstream-merge-8751 
[MIRROR] Fixes overlooked invisible spawner when mapping
 2022-10-16 21:07:35 +00:00
Casey
1d3e58a5a9 Merge pull request #13895 from KillianKirilenko/kk-randomsoap 
Random-Soap Addon
 2022-10-16 21:02:50 +00:00
Nadyr
dc0115955a Merge pull request #5117 from CHOMPStation2/upstream-merge-13868 
[MIRROR] [MIRROR] Rub A Dub Dub [READY FOR MERGE]
 2022-10-11 20:37:18 -04:00
Casey
557371a7f5 Merge pull request #13868 from VOREStation/upstream-merge-8726 
[MIRROR] Rub A Dub Dub [READY FOR MERGE]
 2022-10-10 03:07:29 +00:00
Casey
7a4a02a0fd Smole vending tweak 2022-10-10 02:56:29 +00:00
Razgriz
ddb814a248 Merge pull request #5011 from CHOMPStation2/upstream-merge-12899 
[MIRROR] [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED)
 2022-09-22 22:17:56 -07:00
Razgriz
0a3deac50c powder that makes you give birth to an angry yes demon 2022-09-22 22:01:53 -07:00
Razgriz
2bb42df36d powder that makes you say yes 2022-09-22 21:55:10 -07:00
Casey
efef3da1af Merge pull request #13771 from Heroman3003/hotfood-nerf 
Removes hotfood vendors from station spawning
 2022-09-23 00:56:17 +00:00
Nadyr
d46d8dc33c Merge pull request #4782 from CHOMPStation2/upstream-merge-13570 
[MIRROR] Adds Altevian cuisine
 2022-08-28 19:26:06 -04:00