cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,296 Commits 5 Branches 0 Tags
1cbf5d65ac0b0974b7ef5fc92abbfcabb4d8f47c
Commit Graph

29366 Commits

Author SHA1 Message Date
Nadyr
1cbf5d65ac Merge pull request #1903 from CHOMPStationBot/upstream-merge-8912 
[MIRROR] Fix view spinning reversing movement controls
 2021-05-08 08:02:22 -04:00
Nadyr
17d671dfb2 Merge pull request #1887 from CHOMPStationBot/upstream-merge-10251 
[MIRROR] Fix/adjust some smoleworld related spelling/grammar
 2021-05-08 08:00:26 -04:00
Nadyr
c6ee2d9072 Merge pull request #1904 from CHOMPStationBot/upstream-merge-10241 
[MIRROR] Makes soulcatcher a pre-installed software
 2021-05-08 07:59:14 -04:00
Nadyr
37285e87dd Merge pull request #1906 from CHOMPStationBot/upstream-merge-10250 
[MIRROR] Remove the lore blurb that pollutes the new player menu
 2021-05-08 07:57:36 -04:00
Nadyr
7d819cb74f Merge pull request #1892 from CHOMPStationBot/upstream-merge-10242 
[MIRROR] Reduces cost of Sci and Eng AR programs.
 2021-05-08 07:55:57 -04:00
Nadyr
0ec2104c69 Merge pull request #1902 from CHOMPStationBot/upstream-merge-9254 
[MIRROR] Rabbits don't bumpnom anymore
 2021-05-08 07:52:23 -04:00
Nadyr
9d65893b96 Merge pull request #1901 from CHOMPStationBot/upstream-merge-10240 
[MIRROR] Removes access loss on ID contamination/digestion.
 2021-05-08 07:46:23 -04:00
Nadyr
20484c9e2f Merge pull request #1898 from CHOMPStationBot/upstream-merge-10258 
[MIRROR] Simple player notes filter
 2021-05-08 07:18:14 -04:00
Nadyr
70840e8d6b Merge pull request #1886 from CHOMPStationBot/upstream-merge-10252 
[MIRROR] Fixes carbon shadekin traits
 2021-05-08 06:43:55 -04:00
Aronai Sieyes
4c92adb3e2 Merge pull request #10250 from ShadowLarkens/lore_blurb_dumb 
Remove the lore blurb that pollutes the new player menu
 2021-05-06 17:48:35 +00:00
Aronai Sieyes
c11c46131b Merge pull request #10241 from Heroman3003/free-soulcatchers 
Makes soulcatcher a pre-installed software
 2021-05-06 17:34:08 +00:00
Novacat
7995082a3e Merge pull request #8912 from ShadowLarkens/clientdirmovement 
Fix view spinning reversing movement controls
 2021-05-06 16:42:09 +00:00
Novacat
62064fdfae Merge pull request #9254 from Cyantime/patch-1 
Rabbits don't bumpnom anymore
 2021-05-06 16:32:53 +00:00
Aronai Sieyes
746eb865ed Merge pull request #10240 from Heroman3003/contamination-b-gun 
Removes access loss on ID contamination/digestion.
 2021-05-06 15:45:59 +00:00
Novacat
3f0269a138 Merge pull request #10258 from VOREStation/Arokha/notesfilter 
Simple player notes filter
 2021-05-06 05:18:25 +00:00
Novacat
81ee7a1007 Merge pull request #10242 from Heroman3003/cost-reduce-ar 
Reduces cost of Sci and Eng AR programs.
 2021-05-05 18:46:41 +00:00
Novacat
67a1a215f2 Merge pull request #10251 from Little-119/smoleworld-spelling 
Fix/adjust some smoleworld related spelling/grammar
 2021-05-05 18:46:07 +00:00
Novacat
adce906d78 Merge pull request #10252 from Random-1245/shadekin-traits-fix 
Fixes carbon shadekin traits
 2021-05-05 18:45:59 +00:00
Razgriz
cdf293dbb9 Merge pull request #1876 from Darlantanis/GlobalOreFix 
Webedit ore spawning fix
 2021-05-04 00:52:43 -07:00
Nadyr
b921922a45 missing YW comments 2021-05-01 22:59:23 -04:00
Nadyr
a96cf29a17 Update mine_turfs.dm 2021-05-01 22:57:13 -04:00
Nadyr
33761e0558 Update drill.dm 2021-05-01 22:55:52 -04:00
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