cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-13 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,496 Commits 8 Branches 0 Tags
97dfe1fec84398bdbd21919782bb6dcb33d99abc
Commit Graph

29485 Commits

Author SHA1 Message Date
Nadyr
97dfe1fec8 Merge pull request #1942 from CHOMPStationBot/upstream-merge-10298 
[MIRROR] Tweak synth stuff
 2021-05-12 18:45:12 -04:00
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
Novacat
86ab1a8363 Merge pull request #10303 from VOREStation/Arokha/removeoldnifmenu 
Deprecate NIF statpanel in favor of TGUI
 2021-05-12 17:46:40 +00:00
Nadyr
600122cfb3 Merge pull request #1883 from CHOMPStationBot/upstream-merge-10256 
[MIRROR] Adds various new fat taur variants
 2021-05-12 03:39:34 -04:00
Nadyr
90b4274f92 Remove redundacies due to upstream port 2021-05-12 03:26:44 -04:00
Darlantan
86e7b94971 powder that makes you say yes 2021-05-12 03:11:54 -04:00
Nadyr
5a76adb54f Merge pull request #1944 from CHOMPStationBot/upstream-merge-10302 
[MIRROR] Fix two character spawn bugs
 2021-05-12 02:22:33 -04:00
Novacat
d318defa59 Merge pull request #10302 from VOREStation/Arokha/joinfixes 
Fix two character spawn bugs
 2021-05-12 04:13:20 +00:00
Chompstation Bot
2612365204 [MIRROR] Brings back old tesh radsuit sprites, adds 'fitted' version. 2021-05-11 23:58:55 -04:00
Nadyr
d2163812bb Merge pull request #1937 from CHOMPStationBot/upstream-merge-10273 
[MIRROR] [MIRROR] Adds verb to VV global variables
 2021-05-11 23:55:42 -04:00
Nadyr
30aac542a4 Merge pull request #1913 from CHOMPStationBot/upstream-merge-9820 
[MIRROR] Adds Suffocation Damage option to vore panel/bellies
 2021-05-11 23:55:15 -04:00
Nadyr
5cc75e6770 Merge pull request #1935 from CHOMPStationBot/upstream-merge-10271 
[MIRROR] Adds pizza guy uniform | CHOMP: Also manually adding wolf pelt apparently
 2021-05-11 23:26:03 -04:00
Chompstation Bot
7842c28825 Adds Suffocation Damage option to vore panel/bellies 2021-05-11 23:19:13 -04:00
Nadyr
e341e42a01 Merge pull request #1910 from CHOMPStationBot/upstream-merge-10265 
[MIRROR] [MIRROR] Fixes Virgo #10254.
 2021-05-11 23:16:17 -04:00
Nadyr
7dd7118cb4 Merge branch 'master' into upstream-merge-10265 2021-05-11 23:06:30 -04:00
Nadyr
cec14aa590 Update human.dm 2021-05-11 23:00:14 -04:00
Nadyr
8061357d98 Update _reagents.dm 2021-05-11 22:55:03 -04:00
Nadyr
6e1e68e311 Update holder.dm 2021-05-11 22:50:58 -04:00
Nadyr
4f59ea141c Delete Chemistry-Reagents.dm 2021-05-11 22:46:26 -04:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -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
00db7bb1f4 Update admin_verb_lists.dm 2021-05-11 15:55:22 -07:00
Razgriz
c1dff7a6d3 Update admin_verb_lists.dm 2021-05-11 15:53:09 -07:00
Razgriz
d187bd9da4 Update misc_vr.dm 2021-05-11 15:51:02 -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
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
Chompstation Bot
c136e96487 [MIRROR] Adds verb to VV global variables 2021-05-11 13:06:50 +00:00
Chompstation Bot
8ddc95a405 Adds pizza guy uniform 2021-05-11 13:06:38 +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
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