cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-09 08:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,170 Commits 7 Branches 0 Tags
db68153268365c543a415b9721b2d0fca9a53811
Commit Graph

46273 Commits

Author SHA1 Message Date
Nadyr
db68153268 Merge pull request #3231 from CHOMPStation2/upstream-merge-11831 
[MIRROR] operation RAD APES
 2021-12-05 12:18:12 -05:00
Nadyr
d9774a0ca2 Merge pull request #3233 from CHOMPStation2/upstream-merge-11909 
[MIRROR] Fixes loadout items with apostrophes not being adjustible
 2021-12-05 12:17:29 -05:00
Nadyr
8a8bbef1cb Merge pull request #3235 from CHOMPStation2/upstream-merge-11907 
[MIRROR] Makes wallrot affect all station z-levels (but not dorms)
 2021-12-05 12:17:11 -05:00
Nadyr
1d43637079 Merge pull request #3236 from CHOMPStation2/upstream-merge-11906 
[MIRROR] Fixes another active edge trigger potential
 2021-12-05 12:15:52 -05:00
Nadyr
6bdeaa101d Merge pull request #3232 from CHOMPStation2/upstream-merge-11910 
[MIRROR] fixes the commonwealth engi RIG having the wrong crate
 2021-12-05 12:09:53 -05:00
Nadyr
d1a3c9057b Merge pull request #3237 from CHOMPStation2/upstream-merge-11905 
[MIRROR] Makes stomach organs printable in bioprinter and prosfab
 2021-12-05 12:07:07 -05:00
Nadyr
ef0e4ab070 Merge pull request #3238 from CHOMPStation2/upstream-merge-11904 
[MIRROR] Fixes Claw Machine arcade
 2021-12-05 12:02:56 -05:00
Nadyr
f9a407ba4b powder that makes you say yes 2021-12-05 12:00:39 -05:00
Nadyr
358dfd3f99 powder that makes you say yes 2021-12-05 11:54:45 -05:00
Nadyr
d40865183a powder that makes you say yes 2021-12-05 11:53:43 -05:00
Nadyr
1406500432 powder that makes you say yes 2021-12-05 11:51:30 -05:00
Nadyr
6960aefdc1 powder that makes you say yes 2021-12-05 11:44:40 -05:00
Nadyr
5958689cd1 Merge pull request #3239 from CHOMPStation2/upstream-merge-11903 
[MIRROR] Fixes offsite modulator
 2021-12-05 11:39:52 -05:00
Nadyr
44759870a5 Merge pull request #3240 from CHOMPStation2/upstream-merge-11902 
[MIRROR] Fixes runtime on digging turfs with minor finds
 2021-12-05 11:39:32 -05:00
Nadyr
f4a8eebb8e powder that makes you say yes 2021-12-05 11:29:08 -05:00
Nadyr
a1f5221be9 Merge pull request #3241 from CHOMPStation2/upstream-merge-11901 
[MIRROR] Fixes a bug with sheet storage and drawing too much
 2021-12-05 11:20:28 -05:00
Nadyr
f4939aba6b Merge pull request #3242 from CHOMPStation2/upstream-merge-11896 
[MIRROR] Enables persistance on all z-levels that have persistance flag, not just station ones
 2021-12-05 11:19:53 -05:00
Nadyr
7d37d45756 Merge pull request #3243 from CHOMPStation2/upstream-merge-11895 
[MIRROR] Makes Chocolate Bar recipies require 5 Enzyme catalyst
 2021-12-05 11:19:25 -05:00
Nadyr
ca6f1be700 powder that makes you say yes 2021-12-05 11:19:00 -05:00
Nadyr
1e810da2d5 powder that makes you say yes 2021-12-05 11:09:45 -05:00
Nadyr
ace233ac5d powder that makes you say yes 2021-12-05 11:08:43 -05:00
Nadyr
8871364c15 powder that makes you say yes 2021-12-05 11:07:17 -05:00
Nadyr
4a75d1127d powder that makes you say yes 2021-12-05 11:06:14 -05:00
Nadyr
72cdc6e878 Merge pull request #3244 from CHOMPStation2/upstream-merge-11894 
[MIRROR] Fixes some janky frame issues
 2021-12-05 11:04:47 -05:00
Nadyr
898a751401 powder that makes you say yes 2021-12-05 11:04:21 -05:00
Nadyr
ce08987156 Merge pull request #3245 from CHOMPStation2/upstream-merge-11892 
[MIRROR] Allows Shadekin to use beards
 2021-12-05 10:55:30 -05:00
Nadyr
cc9fa9282c powder that makes you say yes 2021-12-05 10:53:54 -05:00
Nadyr
46e29ec6b6 powder that makes you say yes 2021-12-05 10:52:16 -05:00
Nadyr
c393493c45 powder that makes you say yes 2021-12-05 10:50:54 -05:00
Nadyr
ccc62d8c6c Merge pull request #3246 from CHOMPStation2/upstream-merge-11891 
[MIRROR] Fixes bluespace jumpsuit not having expanded bounds in dorms
 2021-12-05 10:22:06 -05:00
Nadyr
a98f027c97 Merge pull request #3248 from CHOMPStation2/upstream-merge-11889 
[MIRROR] Mice are Nice
 2021-12-05 10:21:55 -05:00
Nadyr
b60ece91ea powder that makes you say yes 2021-12-05 10:16:34 -05:00
Nadyr
aab7b6c936 powder that makes you say yes 2021-12-05 10:09:55 -05:00
Nadyr
efce625af6 powder that makes you say yes 2021-12-05 10:06:25 -05:00
Nadyr
424e31fa41 powder that makes you say yes 2021-12-05 09:58:18 -05:00
Nadyr
dd10417a86 Merge pull request #3250 from CHOMPStation2/upstream-merge-11885 
[MIRROR] [MIRROR] Fixes runtime with ducks and turrets
 2021-12-05 09:54:47 -05:00
Nadyr
ca9b296d14 powder that makes you say yes 2021-12-05 09:49:55 -05:00
Nadyr
e31c38a372 powder that makes you say yes 2021-12-05 09:43:20 -05:00
Nadyr
10b2c20ed3 powder that makes you say yes 2021-12-05 09:33:44 -05:00
Nadyr
713b15a17c powder that makes you say yes 2021-12-05 09:29:13 -05:00
Nadyr
a8490c5623 powder that makes you say yes 2021-12-05 09:27:14 -05:00
Nadyr
0598f69d6c powder that makes you say yes 2021-12-05 09:21:34 -05:00
CHOMPStation2
5e72ae0faa Update chat_commands_zz_ch.dm 2021-12-04 21:31:00 -07:00
Nadyr
7600142bd1 powder that makes you say yes 2021-12-03 20:39:05 -05:00
Casey
770ab32399 Merge pull request #11907 from Heroman3003/wallrot 
Makes wallrot affect all station z-levels (but not dorms)
 2021-12-03 07:33:35 +00:00
Casey
3dfe2ff266 Merge pull request #11909 from Heroman3003/deencode 
Fixes loadout items with apostrophes not being adjustible
 2021-12-03 07:18:17 +00:00
Casey
97312b93c0 fixes the commonwealth engi RIG having the wrong crate 2021-12-03 07:18:09 +00:00
Casey
cfcbab8941 Merge pull request #11831 from Hatterhat/rad-arm 
operation RAD APES
 2021-12-03 07:17:59 +00:00
BlackMajor
c323ab01cd whoops, forgot to get rid of a debugging message 2021-11-25 20:52:01 +13:00
BlackMajor
d0c7ac859c Merge branch 'master' into vorespawn-pred 2021-11-25 19:53:29 +13:00