cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,459 Commits 6 Branches 0 Tags
ca05adcb74943c811a300d4b5a6a70fe403c009c
Commit Graph

65459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nadyr
ca05adcb74 powder that makes you say yes 2021-07-19 19:53:21 -04:00
Chompstation Bot
8b91a9ad50 Add a mapped-in outpost on Virgo 2 2021-07-19 21:17:09 +00:00
Nadyr
5ce4add0c9 Merge pull request #2586 from CHOMPStationBot/upstream-merge-11085 
[MIRROR] Fixes #11081
 2021-07-18 18:33:27 -04:00
Nadyr
2ddceccf2b Merge pull request #2585 from CHOMPStationBot/upstream-merge-11116 
[MIRROR] Do speedboost text with zany regex
 2021-07-18 18:32:44 -04:00
Nadyr
be3982365d Merge pull request #2584 from CHOMPStationBot/upstream-merge-11113 
[MIRROR] Shork sprites for aether suit and commonwealth suit dispenser
 2021-07-18 18:32:20 -04:00
Nadyr
aadc2ea245 Merge pull request #2583 from CHOMPStationBot/upstream-merge-11133 
[MIRROR] Fixes #11127
 2021-07-18 18:31:46 -04:00
Nadyr
7ab2727d7a Merge pull request #2582 from CHOMPStationBot/upstream-merge-11134 
[MIRROR] Fixes #11102
 2021-07-18 18:30:24 -04:00
Nadyr
2099d5b9d0 Merge pull request #2581 from CHOMPStationBot/upstream-merge-11135 
[MIRROR] Fix inventory oversights
 2021-07-18 18:29:54 -04:00
Nadyr
57c45fe8b6 Merge pull request #2579 from CHOMPStationBot/upstream-merge-11131 
[MIRROR] Fixes #11118
 2021-07-18 18:28:10 -04:00
Nadyr
166ec7db90 Merge pull request #2578 from CHOMPStationBot/upstream-merge-11132 
[MIRROR] Fixes #11129
 2021-07-18 18:27:40 -04:00
Chompstation Bot
d8ca7df6a3 Fixes #11081 2021-07-18 19:33:01 +00:00
Aronai Sieyes
0aa9bf3b91 Merge pull request #11085 from MarinaGryphon/bugfix/11081 
Fixes #11081
 2021-07-18 19:33:01 +00:00
Chompstation Bot
35b0c1c722 Do speedboost text with zany regex 2021-07-18 19:31:53 +00:00
Aronai Sieyes
e34bfd5685 Merge pull request #11116 from VOREStation/Arokha/speedboost 
Do speedboost text with zany regex
 2021-07-18 19:31:53 +00:00
Chompstation Bot
47940851a5 Shork sprites for aether suit and commonwealth suit dispenser 2021-07-18 19:25:42 +00:00
Aronai Sieyes
78395a2e3e Merge pull request #11113 from VOREStation/Arokha/dispmob 
Shork sprites for aether suit and commonwealth suit dispenser
 2021-07-18 19:25:42 +00:00
Chompstation Bot
04b803382a Fixes #11127 2021-07-18 19:16:26 +00:00
Novacat
2840252569 Merge pull request #11133 from VOREStation/Fixes/11127 
Fixes #11127
 2021-07-18 19:16:26 +00:00
Chompstation Bot
3cac4b2008 Fixes #11102 2021-07-18 19:16:20 +00:00
Novacat
12e53279a4 Merge pull request #11134 from VOREStation/Fixes/11102 
Fixes #11102
 2021-07-18 19:16:20 +00:00
Chompstation Bot
88f96c53f0 Fix inventory oversights 2021-07-18 19:15:13 +00:00
Novacat
ec8ed94bf4 Merge pull request #11135 from VOREStation/Arokha/backpackgc 
Fix inventory oversights
 2021-07-18 19:15:13 +00:00
Chompstation Bot
d6a0ee5977 Fixes #11118 2021-07-18 19:14:58 +00:00
Novacat
a682e0c5c1 Merge pull request #11131 from VOREStation/Fixes/11118 
Fixes #11118
 2021-07-18 19:14:58 +00:00
Chompstation Bot
0f48323b68 Fixes #11129 2021-07-18 19:14:51 +00:00
Novacat
0bcc9b42e7 Merge pull request #11132 from VOREStation/Fixes/11129 
Fixes #11129
 2021-07-18 19:14:51 +00:00
Nadyr
15295b1caa Merge pull request #2575 from CHOMPStationBot/upstream-merge-11128 
[MIRROR] Compresses and normalizes vore sounds
 2021-07-18 05:09:15 -04:00
Chompstation Bot
0d7771bb89 Compresses and normalizes vore sounds 2021-07-18 06:21:02 +00:00
Novacat
15c32469e1 Merge pull request #11128 from Very-Soft/compressdavoresounds 
Compresses and normalizes vore sounds
 2021-07-18 06:21:01 +00:00
Nadyr
6aa3ed2345 Merge pull request #2574 from CHOMPStationBot/upstream-merge-11115 
[MIRROR] Fix bioprinter alert box
 2021-07-17 18:11:05 -04:00
Nadyr
74222479f9 Merge pull request #2573 from CHOMPStationBot/upstream-merge-11121 
[MIRROR] Fix Agent IDs
 2021-07-17 18:10:44 -04:00
Chompstation Bot
c04bfee22c Fix bioprinter alert box 2021-07-17 14:25:35 +00:00
Novacat
5efcc8488b Merge pull request #11115 from VOREStation/Fixes/11114 
Fix bioprinter alert box
 2021-07-17 14:25:35 +00:00
Chompstation Bot
27fd0664eb Fix Agent IDs 2021-07-17 14:24:27 +00:00
Novacat
b456b5287b Merge pull request #11121 from KillianKirilenko/kk-fixes2 
Fix Agent IDs
 2021-07-17 14:24:27 +00:00
Nadyr
06d8845b5d Merge pull request #2571 from CHOMPStationBot/upstream-merge-11110 
[MIRROR] Fixes a bunch of bools missed in #11100
 2021-07-16 19:19:44 -04:00
Nadyr
02aee304a2 powder that makes you say yes 2021-07-16 19:11:29 -04:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Nadyr
9938e4cf9f Merge pull request #2570 from CHOMPStationBot/upstream-merge-11100 
[MIRROR] Convert some bools to TRUE/FALSE instead of 1/0.
 2021-07-16 19:06:23 -04:00
Nadyr
b4d0e07229 powder that makes you say yes 2021-07-16 18:36:36 -04:00
Nadyr
f4ffa9f8be powder that makes you say yes 2021-07-16 18:30:48 -04:00
Nadyr
dff550747b powder that makes you say yes 2021-07-16 18:28:44 -04:00
Nadyr
2d9e3d2415 powder that makes you say yes 2021-07-16 18:26:42 -04:00
Nadyr
03561c03d6 powder that makes you say yes 2021-07-16 18:20:44 -04:00
Nadyr
f201b53fe4 powder that makes you say yes 2021-07-16 18:15:52 -04:00
Nadyr
257787e880 powder that makes you say yes 2021-07-16 18:13:42 -04:00
Nadyr
3c672d9c5f Merge pull request #2568 from CHOMPStationBot/upstream-merge-11104 
[MIRROR] Fixes organs in belly squirting blood on the floor
 2021-07-16 18:02:51 -04:00
Nadyr
8bd1d66ce2 Merge pull request #2567 from CHOMPStationBot/upstream-merge-11105 
[MIRROR] Fixes a vore message targeted at the belly object
 2021-07-16 18:02:31 -04:00
Nadyr
fcba2f663a Merge pull request #2566 from CHOMPStationBot/upstream-merge-11106 
[MIRROR] Updates fluff clothing to the new non_s format
 2021-07-16 18:02:06 -04:00
Nadyr
d023597ad1 Merge pull request #2565 from Verkister/patch-24 
Fixes belly name stuff for liquidbellies and rubs
 2021-07-16 18:01:36 -04:00