cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-05-01 04:38:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,944 Commits 13 Branches 0 Tags
22d7e1b856f650ca7053475351b69bb63149914d
Commit Graph

31579 Commits

Author SHA1 Message Date
Casey
22d7e1b856 Tether passage blockades 2022-02-13 06:41:40 +00:00
Razgriz
350c8be012 Merge pull request #3641 from Holdelta/materials-update 
Update to Sheet Materials
 2022-02-08 14:19:40 -07:00
Test Turtle
3c06b4dc19 Update to Sheet Materials 
While this doesn't revert all the changes upstream to the mining materials, it does replace most of them with sprites from other servers, which I feel are more appropriate here.
 2022-02-07 17:20:45 -08:00
Casey
b83034829f Merge pull request #12173 from KillianKirilenko/kk-test 
Allergen Reaction Tuning
 2022-02-07 23:17:12 +00:00
Nadyr
e34ca52a87 Merge branch 'master' into upstream-merge-12168 2022-02-06 22:08:28 -05:00
Nadyr
1c9386b2bd Merge pull request #3628 from CHOMPStation2/upstream-merge-12165 
[MIRROR] The final Item Bank patch?
 2022-02-06 22:07:05 -05:00
Nadyr
524db7ba79 Merge pull request #3625 from CHOMPStation2/upstream-merge-12164 
[MIRROR] talon miner
 2022-02-06 21:58:06 -05:00
Nadyr
6e44bb7876 Merge branch 'master' into upstream-merge-12165 2022-02-06 21:53:14 -05:00
Nadyr
77f4e9fb63 Merge pull request #3627 from CHOMPStation2/upstream-merge-12144 
[MIRROR] exosuit cargo expansion equipment
 2022-02-06 21:51:00 -05:00
Nadyr
7f75efc328 powder that makes you say yes 2022-02-06 21:47:41 -05:00
Nadyr
33403c6445 Merge branch 'master' into upstream-merge-12164 2022-02-06 21:38:32 -05:00
Nadyr
d074a0f756 Merge pull request #3624 from CHOMPStation2/upstream-merge-12161 
[MIRROR] Allergy Rebuff
 2022-02-06 21:32:49 -05:00
Casey
0ace36e925 Further item bank restrictions 2022-02-07 02:31:46 +00:00
Nadyr
dd90a7eaa6 Merge pull request #3621 from CHOMPStation2/upstream-merge-12158 
[MIRROR] Item Bank fixy!
 2022-02-06 21:31:20 -05:00
Nadyr
0a454b6c3d Merge pull request #3619 from CHOMPStation2/upstream-merge-12149 
[MIRROR] makes amour for lucky
 2022-02-06 21:02:24 -05:00
Nadyr
5eff6c2f63 Merge branch 'master' into upstream-merge-12158 2022-02-06 20:56:50 -05:00
Nadyr
8818ecf87a powder that makes you say yes 2022-02-06 20:43:03 -05:00
Nadyr
2a5704f056 Merge pull request #3618 from CHOMPStation2/upstream-merge-12152 
[MIRROR] Adds extra advice to Flavor Text popup
 2022-02-06 20:42:18 -05:00
Nadyr
853f1b86a4 Merge pull request #3617 from CHOMPStation2/upstream-merge-12155 
[MIRROR] Item bank!
 2022-02-06 20:41:49 -05:00
Nadyr
4efce5f15f Merge pull request #3615 from CHOMPStation2/upstream-merge-12146 
[MIRROR] skimpy cap "dress" probably more like a leotard idk
 2022-02-06 20:36:30 -05:00
Nadyr
4b2b0c85bc Merge pull request #3614 from CHOMPStation2/upstream-merge-12150 
[MIRROR] mining vendor 1000 thaler reward
 2022-02-06 20:35:33 -05:00
Nadyr
c4ec073076 Merge pull request #3613 from CHOMPStation2/upstream-merge-12145 
[MIRROR] makes a single t3 brace actually support its drill
 2022-02-06 20:35:12 -05:00
Nadyr
fb8a1a2368 Merge pull request #3610 from Cyrelius/master 
Update southern_cross_defines.dm
 2022-02-06 19:33:00 -05:00
Casey
e6f02c05a6 The final Item Bank patch? 2022-02-06 23:29:28 +00:00
Casey
1eabc49fc5 Merge pull request #12144 from Hatterhat/special-compartment 
exosuit cargo expansion equipment
 2022-02-06 23:23:09 +00:00
Casey
80e943716f talon miner 2022-02-06 23:21:47 +00:00
Casey
81be0362a3 Merge pull request #12161 from KillianKirilenko/kk-test 
Allergy Rebuff
 2022-02-06 23:11:19 +00:00
Casey
56d47d2cc1 Item Bank fixy! 2022-02-06 15:46:27 +00:00
Casey
9379f4d1bc makes amour for lucky 2022-02-06 14:18:49 +00:00
Casey
6e4bebaf2a Merge pull request #12152 from Heroman3003/flavor-not-literally 
Adds extra advice to Flavor Text popup
 2022-02-06 14:18:40 +00:00
Casey
525f23c91c Item bank! 2022-02-06 14:18:31 +00:00
Casey
86ca5e5d49 Merge pull request #12146 from Hatterhat/formal-in-the-loosest-sense 
skimpy cap "dress" probably more like a leotard idk
 2022-02-06 14:15:06 +00:00
Casey
e5665c54cf Merge pull request #12150 from PastelPrinceDan/moni 
mining vendor 1000 thaler reward
 2022-02-06 14:13:55 +00:00
Casey
84b984a731 Merge pull request #12145 from Hatterhat/t3drill 
makes a single t3 brace actually support its drill
 2022-02-06 14:12:43 +00:00
Cyrelius
74cf803b31 Update mechfab_designs_ch.dm 
Fix minor mistake.
 2022-02-04 23:51:45 -08:00
Cyrelius
f8a96a807f Update mechfab_designs_ch.dm 
Adds the Phazon to the Exosuit fabricator's crafting menu with what I think are appropriate costs.
 2022-02-03 21:31:15 -08:00
Cyrelius
1d06f2ff55 Update mechfab_designs.dm 
Re-enabled the shields that Virgo disabled, though I did make them a bit higher on the tech list, and added verdantium to their cost.
 2022-02-03 20:57:01 -08:00
Casey
8ee12c5a16 Merge pull request #12148 from KillianKirilenko/kk-test 
[station] tag for paperwork
 2022-02-04 04:16:47 +00:00
Nadyr
1932d42388 Merge pull request #3606 from CHOMPStation2/upstream-merge-12142 
[MIRROR] Minor food tweaks
 2022-02-03 22:51:11 -05:00
Nadyr
595837d18d Merge pull request #3605 from CHOMPStation2/upstream-merge-12128 
[MIRROR] Xenobotany Pass 1 (Of who knows how many)
 2022-02-03 22:50:32 -05:00
Nadyr
1d27bf55c1 Merge pull request #3604 from CHOMPStation2/upstream-merge-12122 
[MIRROR] [MIRROR] Adds caseless BB rounds for common gun types
 2022-02-03 22:48:48 -05:00
Nadyr
4fb570d22f Merge pull request #3602 from CHOMPStation2/upstream-merge-12140 
[MIRROR] Startreader Stunlocks Begone
 2022-02-03 22:45:14 -05:00
Casey
de56611efc Merge pull request #12142 from Heroman3003/foodtweak 
Minor food tweaks
 2022-02-03 06:31:10 +00:00
Casey
4763264965 Merge pull request #12128 from TheObserver-sys/XenoBotanyPass1 
Xenobotany Pass 1 (Of who knows how many)
 2022-02-03 06:29:57 +00:00
Casey
a8d3dce15f Merge pull request #12122 from VOREStation/upstream-merge-8385 
[MIRROR] Adds caseless BB rounds for common gun types
 2022-02-03 06:28:45 +00:00
Casey
daa703ac73 Merge pull request #12140 from KillianKirilenko/kk-test 
Startreader Stunlocks Begone
 2022-02-01 19:49:49 +00:00
Cyrelius
6ecaa54625 Update phase.dm 
Add chompedit tags as requested.
 2022-01-29 21:00:25 -08:00
Cyrelius
008bf33299 Merge branch 'CHOMPStation2:master' into master 2022-01-29 16:38:44 -08:00
Nadyr
b9538b2b67 Merge pull request #3590 from CHOMPStation2/upstream-merge-12100 
[MIRROR] Makes vulpkanin ingame lore match our actual lore
 2022-01-29 17:31:11 -05:00
Nadyr
27dd908ddf Merge pull request #3596 from CHOMPStation2/upstream-merge-12124 
[MIRROR] Removes Polaris whitelists from certain sprite accessories
 2022-01-29 17:21:50 -05:00