cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,446 Commits 6 Branches 0 Tags
31b47bc0d1fa6a6f16a2fdedef004d1d38d0effb
Commit Graph

43863 Commits

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
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
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
Novacat
7c0a30ab09 Merge pull request #10276 from VOREStation/upstream-merge-8069 
[MIRROR] The Personal Computer Unit
 2021-05-11 13:06:43 +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
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
Novacat
dec9537f54 Merge pull request #10288 from VOREStation/Arokha/nifruntime 
Fix NIF runtime
 2021-05-11 13:05:51 +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
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
f74b9bd1ca Protean fixes 1 
Add placeholder for protean robolimbs
 2021-05-11 01:24:54 -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
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
Chompstation Bot
9e9452bd2f Readd nif softshop descriptions as tooltips 2021-05-10 07:12:36 -04:00
Nadyr
8654aff7b6 github you fuck 2021-05-10 01:32:23 -04:00
Nadyr
88b1b04bd8 Merge branch 'master' into upstream-merge-10247 2021-05-10 01:30:24 -04:00
ZVB334
d5762fa5d1 Adds sound to screams 2021-05-09 16:46:22 -05:00
ZVB334
ac9b79b737 Commented out sneeze because sneezeb was causing issues, ie, getting cut off 2021-05-09 16:31:36 -05:00
Novacat
ff41a0fc27 Merge pull request #10269 from Heroman3003/jam-them-sensors 
Adds Jams Sensors belly mode addon
 2021-05-09 12:55:44 +00:00
Nadyr
b5566ff403 Merge pull request #1914 from CHOMPStationBot/upstream-merge-10268 
[MIRROR] Adds a big batch of mobs to maint pred pool
 2021-05-09 07:47:25 -04:00
Nadyr
0f2b8e57a4 Merge pull request #1880 from CHOMPStationBot/upstream-merge-10248 
[MIRROR] [MIRROR] Swaps emote(me) out for custom_emote().
 2021-05-09 07:39:11 -04:00
Nadyr
08fac1ebbe Update giant_spider_vr.dm 2021-05-09 07:36:31 -04:00
Nadyr
0485dceb5c Merge branch 'master' into upstream-merge-10194 2021-05-09 07:27:43 -04:00
Nadyr
aef0b3ab2c Update emote.dm 2021-05-09 07:07:43 -04:00
Nadyr
2ddabe9183 Update emote.dm 2021-05-09 06:59:06 -04:00
Nadyr
e754329bdb Update teshari.dm 2021-05-09 06:57:16 -04:00
Nadyr
688acf0711 Update species.dm 2021-05-09 06:48:55 -04:00
Nadyr
baf0aae073 Update species.dm 2021-05-09 06:42:43 -04:00
Nadyr
e75a3b1354 Update emote_vr.dm 2021-05-09 06:36:29 -04:00
Nadyr
e0f6cb84c9 Merge branch 'master' into upstream-merge-10050 2021-05-09 06:13:32 -04:00