cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,253 Commits 7 Branches 0 Tags
05bc2c8e9b9435463b4f32e96cd42802c06bfae1
Commit Graph

29344 Commits

Author SHA1 Message Date
Darlantan
05bc2c8e9b moves greyscale belly overlays to _ch dmi 2021-05-01 22:08:53 -04:00
Razgriz
e9fbca463f Merge branch 'master' into upstream-merge-10207 2021-04-30 22:24:39 -07:00
Razgriz
40b77f37e4 Update beams_vr.dm 2021-04-30 22:22:31 -07:00
Razgriz
8964acaca1 Update laser_vr.dm 2021-04-30 22:21:37 -07:00
Razgriz
fc510ae854 Pursuit hardsuit icon fixes 2021-04-30 21:51:14 -07:00
Razgriz
a36f228f2c Merge branch 'master' into upstream-merge-10238 2021-04-30 19:37:25 -07:00
Razgriz
ad16d9629b Merge pull request #1857 from CHOMPStationBot/upstream-merge-10210 
[MIRROR] Exploration Balance Tweaks
 2021-04-30 19:36:55 -07:00
Razgriz
6b8a71a7b5 Update laser_vr.dm 2021-04-30 19:24:12 -07:00
Razgriz
2dd6a940c2 Merge pull request #1872 from CHOMPStationBot/upstream-merge-10233 
[MIRROR] [MIRROR] Fixes Stunrevolver PATH
 2021-04-30 19:12:41 -07:00
Razgriz
55b7a81985 Update laser_vr.dm 2021-04-30 19:12:26 -07:00
Razgriz
7171a1e54b Update laser_vr.dm 2021-04-30 19:11:42 -07:00
Novacat
086f4ff0b8 Merge pull request #10233 from VOREStation/upstream-merge-8053 
[MIRROR] Fixes Stunrevolver PATH
 2021-05-01 01:23:02 +00:00
Chompstation Bot
08534fd4a7 Minor Fixes 2021-05-01 01:22:56 +00:00
Nadyr
c496a682c7 Merge pull request #1860 from ZVB334/FrostOilAlum 
Adds Liquid Copper/Aluminium to Sheets Reactions
 2021-04-30 17:35:21 -04:00
ZVB334
64e3ff5fba Moved to _ch file 2021-04-30 07:37:24 -05:00
Nadyr
9dd025973b Merge pull request #1869 from Darlantanis/Fixes-#10237-2 
Emergency earlyport of "Fixes #10237"
 2021-04-30 02:46:36 -04:00
Nadyr
8d05156f42 earlyport fix 2021-04-30 02:33:07 -04:00
Nadyr
61dbe68e54 Merge pull request #1867 from CHOMPStationBot/upstream-merge-10219 
[MIRROR] [MIRROR] Adds config option to control loadout whitelist strictness
 2021-04-30 02:28:10 -04:00
Nadyr
6ed37fd72a Merge pull request #1866 from CHOMPStationBot/upstream-merge-10192 
[MIRROR] [MIRROR] Moves material stacks to modules/materials
 2021-04-30 02:12:51 -04:00
Nadyr
f67bd28e3a Merge branch 'master' into upstream-merge-10219 2021-04-30 02:05:30 -04:00
Nadyr
f75ba84710 Merge pull request #1865 from CHOMPStationBot/upstream-merge-10223 
[MIRROR] [MIRROR] Sanitizes languages, ears/wings/tail prefs on login
 2021-04-30 02:03:42 -04:00
Nadyr
11e49d2f00 Delete materials_ch.dm 2021-04-30 01:51:29 -04:00
Nadyr
3dee3182c4 Create cloth_ch.dm 2021-04-30 01:50:21 -04:00
Nadyr
ee4c7b23f6 Delete material_recipes_ch.dm 2021-04-30 01:46:47 -04:00
Nadyr
47eb696051 Create plasteel_ch.dm 2021-04-30 01:46:31 -04:00
Nadyr
af8eddf8e5 Create wood_ch.dm 2021-04-30 01:45:27 -04:00
Nadyr
6e6860f5e2 Update plastic.dm 2021-04-30 01:44:47 -04:00
Nadyr
5455cf8cb6 Create plastic_ch.dm 2021-04-30 01:44:26 -04:00
Nadyr
88e8a4ce45 Delete wood_ch.dm 2021-04-30 01:42:20 -04:00
Nadyr
6168af405c Delete plastic_ch.dm 2021-04-30 01:42:05 -04:00
Nadyr
74d12b9d39 Create wood_ch.dm 2021-04-30 01:40:31 -04:00
Nadyr
78b2101c9e Create plastic_ch.dm 2021-04-30 01:39:54 -04:00
Nadyr
5283c62b41 Delete material_recipes.dm 2021-04-30 01:36:02 -04:00
Nadyr
c471121e12 Update plastic.dm 2021-04-30 01:35:30 -04:00
Nadyr
90fbe63cc3 Delete materials.dm 2021-04-30 01:31:42 -04:00
Nadyr
e729ec2953 Update cloth.dm 2021-04-30 01:31:31 -04:00
Nadyr
9d401ead5f Merge pull request #1858 from CHOMPStationBot/upstream-merge-10213 
[MIRROR] Both fixes and comments out WL check
 2021-04-30 01:15:48 -04:00
Nadyr
0ac27ecbe3 Update 03_body.dm 2021-04-30 01:14:57 -04:00
Nadyr
1e0f3485ac Update 02_language.dm 2021-04-30 01:11:33 -04:00
Nadyr
c612e66359 Merge pull request #1863 from CHOMPStationBot/upstream-merge-10224 
[MIRROR] [MIRROR] Makes mineral turf oretype list static
 2021-04-30 01:06:39 -04:00
Nadyr
fefd3b6641 Merge pull request #1862 from CHOMPStationBot/upstream-merge-10217 
[MIRROR] Add LUNA's Medals
 2021-04-30 01:05:34 -04:00
Nadyr
8cd695295c Merge pull request #1861 from CHOMPStationBot/upstream-merge-10216 
[MIRROR] Add Entchtut's medal
 2021-04-30 01:04:55 -04:00
Nadyr
a34fd9cec8 Merge branch 'master' into upstream-merge-10213 2021-04-30 01:03:17 -04:00
Nadyr
1930a85c2c Merge pull request #1854 from CHOMPStationBot/upstream-merge-10208 
[MIRROR] Makes Protean blobform less robust
 2021-04-30 00:54:38 -04:00
Nadyr
1b2f02bc02 Merge pull request #1859 from Holdelta/master 
Adding back Teshari Radiation Suits from YawnWider
 2021-04-30 00:50:10 -04:00
Nadyr
0be4fe8fd2 Merge pull request #1851 from CHOMPStationBot/upstream-merge-10206 
[MIRROR] [MIRROR] Makes xenowear species WL check for species instead of ckey
 2021-04-30 00:42:42 -04:00
Nadyr
cb415c440c Merge pull request #1850 from CHOMPStationBot/upstream-merge-10202 
[MIRROR] Fixes voremob icon updates messing with scaling
 2021-04-30 00:41:13 -04:00
Nadyr
b600895a52 Merge pull request #1849 from CHOMPStationBot/upstream-merge-10201 
[MIRROR] [MIRROR] Drink Overhaul V1.2
 2021-04-30 00:40:42 -04:00
Chompstation Bot
606e2e757c [MIRROR] Adds config option to control loadout whitelist strictness 2021-04-28 16:46:12 +00:00
Chompstation Bot
fd5b2f094f [MIRROR] Moves material stacks to modules/materials 2021-04-28 16:38:58 +00:00