cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,284 Commits 6 Branches 0 Tags
cbb2b1e7fc50e2bc084091f58eaed196519f68b9
Commit Graph

327 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
9d1fa79b33 [MIRROR] Prot rig up port (#9585) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-09 22:51:31 +01:00
CHOMPStation2StaffMirrorBot
f7e9f8d12b [MIRROR] Ring/Watch Accessory Transfer (#9489) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-19 19:14:32 +01:00
CHOMPStation2StaffMirrorBot
61a5f758ac [MIRROR] Headset Refactor and Selection (#9438) 
Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-11-07 23:17:05 +01:00
Kashargul
3becf31cf4 manually ports last upstream PRs (#9286) 2024-10-24 00:37:53 +02:00
CHOMPStation2
82a2178c7a [MIRROR] Single language translators (#9221) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-12 19:15:09 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
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
eb4f254c80 [MIRROR] [Ready] Hanner Species (#8923) 
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-11 09:39:52 +02:00
CHOMPStation2
7a5d3341a7 [MIRROR] Supply System Updates (#8814) 
Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-08-28 15:42:58 +02:00
MeepleMuncher
d2c88c7340 Alternate Teppi Plushie (Wif Different Spritee) (#8832) 2024-08-26 13:40:41 +02:00
Guti
5a51008d06 Teppi Plush (#8816) 2024-08-23 00:09:58 +02:00
CHOMPStation2
4503ad3890 [MIRROR] Adjusts stationside first aid spawns (#8797) 
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-08-22 23:04:23 +02:00
CHOMPStation2
dba6af8168 [MIRROR] Mega nukies (#8668) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-07-27 18:15:58 +02:00
CHOMPStation2
cddbbd6298 [MIRROR] Monster Bait (#8667) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-07-22 15:37:29 +02:00
CHOMPStation2
5587f829ce [MIRROR] Butterfly nets (#8627) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-07-18 07:54:05 +02:00
CHOMPStation2
e732aaa82b [MIRROR] Bluespace Crackers (#8560) 
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-06-27 16:18:41 +02:00
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