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

73 Commits

Author SHA1 Message Date
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
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
FluffMedic
2a43353d18 Merge branch 'master' into craft 2023-06-20 15:26:56 -04: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
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
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
Casey
1d3e58a5a9 Merge pull request #13895 from KillianKirilenko/kk-randomsoap 
Random-Soap Addon
 2022-10-16 21:02:50 +00: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
da9722545b More casino updates 2022-08-21 19:38:41 +00:00
Razgriz
4cedeee7e0 powder that makes you say yes 2022-04-05 21:17:53 -07:00
Casey
61ea8e3f3d New Donk-pockets 2022-04-06 02:12:51 +00:00
Casey
de0be34c99 The Grand /TG Port - Part 6 2022-04-03 03:32:03 +00:00
Nadyr
83caabb9c7 powder that makes you say yes 2022-03-25 18:32:51 -04:00
Casey
e71a04a991 Merge pull request #12504 from GhostActual/Robs-You-In-Public 
Robs You In Public
 2022-03-21 20:21:21 +00:00
Casey
5510dbf441 Merge pull request #12392 from Heroman3003/cookiefix 
Brings REAL cookies to everywhere they belong
 2022-03-07 09:06:24 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Chompstation Bot
0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
Aronai Sieyes
116edd7995 Merge pull request #11543 from VOREStation/upstream-merge-8246 
[MIRROR] Random Spawner Stuff
 2021-10-22 18:23:30 +00:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Chompstation Bot
b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Aronai Sieyes
d87b3c84e5 Merge pull request #10859 from VOREStation/Arokha/iconfixes 
Random item missing sprites
 2021-07-04 03:17:27 +00:00
Aronai Sieyes
64db1a458b Merge pull request #10802 from VOREStation/Icons/food 
Port several foods and food sprites
 2021-07-03 20:31:07 +00:00
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Aronai Sieyes
ac00965e68 cock 2021-06-19 22:03:38 -07:00
Novacat
5d69f8878d Merge pull request #10373 from ShadowLarkens/fix_vending 
Initialize all vending products on server start & fix multiple food icons
 2021-05-22 03:50:10 +00:00
Novacat
d9fb7b0a42 Merge pull request #10368 from VOREStation/upstream-merge-8083 
[MIRROR] Food 4 thought
 2021-05-21 20:00:24 +00:00
Novacat
b98bab980f Merge pull request #10351 from VOREStation/upstream-merge-8082 
[MIRROR] More Spawner Tweaks
 2021-05-18 12:32:05 +00:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Nadyr
65946e5c49 Update misc.dm 2021-05-08 08:36:11 -04:00
Novacat
f2fc4c8be7 Merge pull request #9960 from VOREStation/upstream-merge-7974 
[MIRROR] Added Doctress' Jager drink.
 2021-03-18 14:40:00 +00:00
kcin2001
7251099263 adds sif and station toy (reduces size of action figs too) 
adds a sif toy and station toy, added to relevant sources and reduces size of action figures because they did not need to be so big
 2021-03-05 01:15:58 -08:00
Novacat
3f3e7c536f Merge pull request #9691 from VOREStation/upstream-merge-7865 
[MIRROR] Allows custom-selection of posters
 2021-02-12 21:27:50 +00:00
Nadyr
f9f0b60bc5 Update misc.dm 2021-01-07 22:29:39 -05:00
Nadyr
ca1eedb24e Update misc.dm 2021-01-07 22:24:37 -05:00
Chompstation Bot
601c842d13 Added Drakeborgs for sillicons along with plushies 2021-01-06 19:52:47 +00:00
Nadyr
cdc8abcbb9 Update misc.dm 2021-01-03 21:38:36 -05:00
Chompstation Bot
d96a127b4a Ports Vox Plushie from Paradise 2020-12-26 01:59:20 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Braiden
71266ace1e added new plushies to drop lists 2020-09-19 03:03:09 -05:00
Killian
c7242b59de Update Random Spawners (#7614) 
* Update spacesuits.dm

* more random stuff

* even more random stuff, plus changelog

* random large, couple more odds & ends

* more tweaks
 2020-09-05 10:26:14 -04:00
Rykka
5acb88413c Rename toy/mech to toy/mecha to match mecha code. 2020-08-12 20:08:05 -04:00
Rykka
a5fc9d81ce Adds Mech Toy Battles! 
Port of https://github.com/tgstation/tgstation/pull/51817

Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!
 2020-08-12 04:31:00 -04:00