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,635 Commits 6 Branches 0 Tags
1433deddfc55e88c0eb6246564ef18c001b0340e
Commit Graph

19190 Commits

Author SHA1 Message Date
Nadyr
1433deddfc Merge pull request #2626 from CHOMPStationBot/upstream-merge-11197 
[MIRROR] Expands spider features
 2021-07-22 18:26:01 -04:00
Aronai Sieyes
23e62b1217 Merge pull request #11205 from VOREStation/Arokha/hullcornerao 
Dodge ambient occlusion on hull corners
 2021-07-22 16:29:51 +00:00
Chompstation Bot
58a498c918 Expands spider features 2021-07-22 16:20:15 +00:00
Nadyr
2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179 
[MIRROR] Optimize a couple things
 2021-07-20 21:45:26 -04:00
Nadyr
c399d6a682 powder that makes you say yes 2021-07-20 21:28:09 -04:00
Nadyr
dba3747ed5 Merge pull request #2621 from CHOMPStationBot/upstream-merge-11165 
[MIRROR] Small light optimizations
 2021-07-20 21:26:15 -04:00
Nadyr
ce4763c2fb Merge pull request #2618 from CHOMPStationBot/upstream-merge-11178 
[MIRROR] TTS Devices can now be used in chairs, and by alt clicking from pockets
 2021-07-20 21:24:59 -04:00
Nadyr
1902d10543 powder that makes you say yes 2021-07-20 21:16:01 -04:00
Nadyr
fa6ec29be6 powder that makes you say yes 2021-07-20 21:14:45 -04:00
Nadyr
a5485ef8f1 powder that makes you say yes 2021-07-20 21:14:18 -04:00
Nadyr
170ad8680e powder that makes you say yes 2021-07-20 21:09:46 -04:00
Nadyr
f2633453de powder that makes you say yes 2021-07-20 21:08:30 -04:00
Nadyr
4cb45618a0 powder that makes you say yes 2021-07-20 21:06:36 -04:00
Nadyr
d6f1561d42 Merge branch 'CHOMPStation2:master' into upstream-merge-11163 2021-07-20 21:05:41 -04:00
Nadyr
b48ecdbc98 Merge pull request #2601 from CHOMPStationBot/upstream-merge-11112 
[MIRROR] Xenomorph Overhaul and fixes from Gurgstation
 2021-07-20 21:04:13 -04:00
Nadyr
744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -04:00
Nadyr
6d04a2b025 Merge pull request #2610 from CHOMPStationBot/upstream-merge-11176 
[MIRROR] Allows hiding mobs/areas from observers without completely forbidding
 2021-07-20 20:54:22 -04:00
Nadyr
62cc1bc89d Merge pull request #2615 from CHOMPStationBot/upstream-merge-11181 
[MIRROR] Add art possibility to Virgo 2 surface outpost
 2021-07-20 20:41:59 -04:00
Nadyr
08496b6695 Merge pull request #2614 from CHOMPStationBot/upstream-merge-11182 
[MIRROR] Add code to trace recursive buckle issue
 2021-07-20 20:40:42 -04:00
Nadyr
eca41e58cd Merge pull request #2607 from CHOMPStationBot/upstream-merge-11170 
[MIRROR] Finishes purge of Industrial Expansion
 2021-07-20 20:28:28 -04:00
Nadyr
5f5ab7b22c Merge pull request #2604 from CHOMPStationBot/upstream-merge-11162 
[MIRROR] Fix two suit cycler problems
 2021-07-20 20:27:09 -04:00
Nadyr
33111d164c powder that makes you say yes 2021-07-20 19:42:54 -04:00
Aronai Sieyes
ab88b2420d Merge pull request #11165 from VOREStation/Arokha/lightport 
Small light optimizations
 2021-07-20 23:03:17 +00:00
Nadyr
12997ce830 powder that makes you say yes 2021-07-20 18:53:55 -04:00
Nadyr
aa0f75b9ef powder that makes you say yes 2021-07-20 18:50:14 -04:00
Aronai Sieyes
26f3292fc1 Merge pull request #11178 from Mewchild/MC-TtSQoL 
TTS Devices can now be used in chairs, and by alt clicking from pockets
 2021-07-20 21:30:27 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Aronai Sieyes
442c888d5e Merge pull request #11181 from VOREStation/Arokha/farpaint 
Add art possibility to Virgo 2 surface outpost
 2021-07-20 21:30:04 +00:00
Aronai Sieyes
369afc6018 Merge pull request #11182 from VOREStation/Arokha/bucklefind 
Add code to trace recursive buckle issue
 2021-07-20 21:29:56 +00:00
Chompstation Bot
7437154387 Allows hiding mobs/areas from observers without completely forbidding 2021-07-20 15:03:10 +00:00
Aronai Sieyes
66669af98d Merge pull request #11170 from Heroman3003/thepurge 
Finishes purge of Industrial Expansion
 2021-07-20 14:46:30 +00:00
Chompstation Bot
21f58709d7 Fix two suit cycler problems 2021-07-20 03:20:06 +00:00
Chompstation Bot
ba4dc7c3ff Tweak alien eggs 2021-07-20 03:19:59 +00:00
Chompstation Bot
b85c5de137 Xenomorph Overhaul and fixes from Gurgstation 2021-07-20 01:06:44 +00:00
Novacat
0dfa34c578 Merge pull request #11160 from VOREStation/Arokha/accessfinder 
Gives pathfinder an actual access level
 2021-07-20 00:59:30 +00:00
Nadyr
4a6c523aa6 Merge pull request #2591 from CHOMPStationBot/upstream-merge-11141 
[MIRROR] Add a mapped-in outpost on Virgo 2
 2021-07-19 20:09:47 -04:00
Nadyr
d189d28954 Merge pull request #2596 from CHOMPStationBot/upstream-merge-11153 
[MIRROR] Fixes #11151
 2021-07-19 19:56:57 -04:00
Nadyr
ca05adcb74 powder that makes you say yes 2021-07-19 19:53:21 -04:00
Aronai Sieyes
bd74045604 Merge pull request #11153 from VOREStation/Fixes/11151attempt2 
Fixes #11151
 2021-07-19 22:22:45 +00:00
Chompstation Bot
8b91a9ad50 Add a mapped-in outpost on Virgo 2 2021-07-19 21:17:09 +00:00
Chompstation Bot
dc1328d93c Fixes Talon being referred to as if ITV is a company 2021-07-19 15:12:30 +00: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
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
Novacat
2840252569 Merge pull request #11133 from VOREStation/Fixes/11127 
Fixes #11127
 2021-07-18 19:16:26 +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
Novacat
5efcc8488b Merge pull request #11115 from VOREStation/Fixes/11114 
Fix bioprinter alert box
 2021-07-17 14:25:35 +00:00
Novacat
b456b5287b Merge pull request #11121 from KillianKirilenko/kk-fixes2 
Fix Agent IDs
 2021-07-17 14:24:27 +00: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
f201b53fe4 powder that makes you say yes 2021-07-16 18:15:52 -04:00