cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,446 Commits 7 Branches 0 Tags
31b47bc0d1fa6a6f16a2fdedef004d1d38d0effb
Commit Graph

63446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nadyr
31b47bc0d1 powder that makes you say yes 2021-05-12 18:20:23 -04:00
Nadyr
2a16c0d6e5 powder that makes you say yes 2021-05-12 18:18:47 -04:00
Nadyr
3bce32f1e0 powder that makes you say yes 2021-05-12 18:15:43 -04:00
Nadyr
294abf2ee2 powder that makes you say yes 2021-05-12 18:12:16 -04:00
Nadyr
c6572af5de powder that makes you say yes 2021-05-12 18:10:59 -04:00
Nadyr
ccc7fbab62 powder that makes you say yes 2021-05-12 18:09:36 -04:00
Nadyr
21d0f89b11 powder that makes you say yes 2021-05-12 18:07:50 -04:00
Nadyr
43a3fa4cb3 powder that makes you say yes 2021-05-12 18:06:49 -04:00
Nadyr
aba0ea1150 powder that makes you say yes 2021-05-12 18:04:54 -04:00
Nadyr
6f02754446 powder that makes you say yes 2021-05-12 18:03:53 -04:00
Nadyr
e5113a0984 powder that makes you say yes 2021-05-12 17:59:16 -04:00
Razgriz
ba57743592 Merge branch 'master' into upstream-merge-10298 2021-05-11 15:58:14 -07:00
Razgriz
e57b2771e0 Update human_helpers.dm 2021-05-11 15:57:47 -07:00
Razgriz
04a8c35801 Merge pull request #1938 from CHOMPStationBot/upstream-merge-10272 
[MIRROR] [MIRROR] Updates CI's OS image version to fix package deficiency
 2021-05-11 15:54:16 -07:00
Razgriz
c4ca47fb5e Merge pull request #1936 from CHOMPStationBot/upstream-merge-10276 
[MIRROR] [MIRROR] The Personal Computer Unit
 2021-05-11 15:51:54 -07:00
Razgriz
acd1db548e Merge pull request #1933 from CHOMPStationBot/upstream-merge-10280 
[MIRROR] Allow more than one ore processor
 2021-05-11 15:48:51 -07:00
Razgriz
142abdd5c5 Merge pull request #1932 from CHOMPStationBot/upstream-merge-10228 
[MIRROR] 1Z Talon Project
 2021-05-11 15:48:14 -07:00
Razgriz
1b01b5c2d4 Merge pull request #1930 from CHOMPStationBot/upstream-merge-10284 
[MIRROR] Pass true for tgs_prime to Master.Initialize()
 2021-05-11 15:47:05 -07:00
Razgriz
76db003474 Merge pull request #1928 from CHOMPStationBot/upstream-merge-10288 
[MIRROR] Fix NIF runtime
 2021-05-11 15:46:12 -07:00
Razgriz
32c2d66667 Merge pull request #1925 from CHOMPStationBot/upstream-merge-10294 
[MIRROR] [MIRROR] B to Resist!
 2021-05-11 15:45:42 -07:00
Razgriz
ff795add29 Merge pull request #1924 from CHOMPStation2/Razgriz1032-patch-9 
Port one line that wasn't ported
 2021-05-11 15:45:22 -07:00
Razgriz
e38b1d0b5e Merge pull request #1915 from CHOMPStationBot/upstream-merge-10269 
[MIRROR] Adds Jams Sensors belly mode addon
 2021-05-11 15:45:00 -07:00
Chompstation Bot
a06e872c51 Tweak synth stuff 2021-05-11 22:04:18 +00:00
Chompstation Bot
5868c408c9 [MIRROR] Updates CI's OS image version to fix package deficiency 2021-05-11 13:06:56 +00:00
Novacat
ea704afe34 Merge pull request #10272 from VOREStation/upstream-merge-8070 
[MIRROR] Updates CI's OS image version to fix package deficiency
 2021-05-11 13:06:56 +00:00
Chompstation Bot
5fb93f8db8 [MIRROR] The Personal Computer Unit 2021-05-11 13:06:43 +00:00
Novacat
7c0a30ab09 Merge pull request #10276 from VOREStation/upstream-merge-8069 
[MIRROR] The Personal Computer Unit
 2021-05-11 13:06:43 +00:00
Chompstation Bot
96db497a90 Allow more than one ore processor 2021-05-11 13:06:25 +00:00
Novacat
866824fa85 Merge pull request #10280 from VOREStation/Arokha/multiore 
Allow more than one ore processor
 2021-05-11 13:06:25 +00:00
Chompstation Bot
9e607da749 1Z Talon Project 2021-05-11 13:06:18 +00:00
Chompstation Bot
2239d5b6fa Pass true for tgs_prime to Master.Initialize() 2021-05-11 13:06:04 +00:00
Novacat
05ff96f6a8 Merge pull request #10284 from VOREStation/vplk-vgs-prime-fix 
Pass true for tgs_prime to Master.Initialize()
 2021-05-11 13:06:04 +00:00
Chompstation Bot
17edd8f55d Fix NIF runtime 2021-05-11 13:05:51 +00:00
Novacat
dec9537f54 Merge pull request #10288 from VOREStation/Arokha/nifruntime 
Fix NIF runtime
 2021-05-11 13:05:51 +00:00
Chompstation Bot
61f633c50e [MIRROR] B to Resist! 2021-05-11 13:05:31 +00:00
Novacat
5cfc6d95bd Merge pull request #10294 from VOREStation/upstream-merge-8062 
[MIRROR] B to Resist!
 2021-05-11 13:05:31 +00:00
Razgriz
06ca1f1334 Merge pull request #1923 from Shadow-Quill/shtteringfix 
[MANUAL PORT] Fixes SSMobs Shattering due to Proteans
 2021-05-11 01:45:24 -07:00
Razgriz
1a3b802209 Merge pull request #1921 from CHOMPStation2/ProteanBuggin 
[MANUAL MIRROR] Add placeholder for protean robolimbs
 2021-05-11 01:45:14 -07:00
Razgriz
63867629e4 Port one line that wasn't ported 
Port one line that wasn't ported in CHOMPStation2#1888 from https://github.com/VOREStation/VOREStation/pull/10247/files

I'm scared.
 2021-05-11 01:42:24 -07:00
Unknown
fd3a02f318 Fixes SSMobs Shattering due to Proteans 
Port of https://github.com/PolarisSS13/Polaris/pull/8073
 2021-05-11 03:31:24 -05:00
Razgriz
6cd5f0c4d2 Merge pull request #1919 from CHOMPStation2/dependabot/npm_and_yarn/tgui/lodash-4.17.21 
Bump lodash from 4.17.19 to 4.17.21 in /tgui
 2021-05-11 01:29:16 -07:00
Razgriz
f74b9bd1ca Protean fixes 1 
Add placeholder for protean robolimbs
 2021-05-11 01:24:54 -07:00
Shadow-Quill
8d92f1037b Merge pull request #371 from CHOMPStation2/master 
[pull] master from CHOMPStation2:master
 2021-05-11 02:39:35 -05:00
Razgriz
cfeb771bd3 Merge pull request #1920 from Verkister/patch-7 
Fixes Wing/Tail/Ear Sanitation
 2021-05-10 11:59:11 -07:00
Verkister
1b2b54d58c Fixes Wing/Tail/Ear Sanitation 
manual port of https://github.com/VOREStation/VOREStation/pull/10279
 2021-05-10 17:49:13 +03:00
dependabot[bot]
1725b1957c Bump lodash from 4.17.19 to 4.17.21 in /tgui 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-10 12:18:21 +00:00
Nadyr
233bb106f0 Merge pull request #1911 from CHOMPStationBot/upstream-merge-10267 
[MIRROR] Readd nif softshop descriptions as tooltips
 2021-05-10 07:56:22 -04:00
Nadyr
34d6bcee33 bundle fix 2021-05-10 07:22:00 -04:00
Nadyr
00d855cbe4 Update vending.dm 2021-05-10 07:20:54 -04:00
Nadyr
95e607b102 Delete vending.dm 2021-05-10 07:19:08 -04:00