cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,617 Commits 8 Branches 0 Tags
1372d838e1b33b92a33bf1211b0025caa94aa273
Commit Graph

9711 Commits

Author SHA1 Message Date
Chompstation Bot
1372d838e1 Port Bay and Eris walls 2021-07-22 20:29:32 +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
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
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
12997ce830 powder that makes you say yes 2021-07-20 18:53:55 -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
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
Nadyr
d189d28954 Merge pull request #2596 from CHOMPStationBot/upstream-merge-11153 
[MIRROR] Fixes #11151
 2021-07-19 19:56:57 -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
dc1328d93c Fixes Talon being referred to as if ITV is a company 2021-07-19 15:12:30 +00:00
Novacat
b456b5287b Merge pull request #11121 from KillianKirilenko/kk-fixes2 
Fix Agent IDs
 2021-07-17 14:24:27 +00: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
Nadyr
257787e880 powder that makes you say yes 2021-07-16 18:13:42 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Nadyr
20e6781341 Merge pull request #2553 from CHOMPStationBot/upstream-merge-11080 
[MIRROR] Ports new Bay SolGov suits as Commonwealth suits
 2021-07-15 20:26:17 -04:00
Nadyr
46034c244b powder that makes you say yes 2021-07-15 19:36:22 -04:00
Nadyr
425fca482d Merge pull request #2542 from CHOMPStationBot/upstream-merge-11065 
[MIRROR] Removes unnecessary, unused, and redundant helpers.
 2021-07-15 19:30:37 -04:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Nadyr
4732d60369 Merge pull request #2554 from CHOMPStationBot/upstream-merge-11093 
[MIRROR] Allow emptying contents from nearby bags
 2021-07-15 19:21:15 -04:00
Nadyr
7e0df4d4ca Merge branch 'master' into upstream-merge-11065 2021-07-15 19:19:34 -04:00
Nadyr
951d4b303f Merge pull request #2528 from CHOMPStationBot/upstream-merge-11032 
[MIRROR] Add a lot of clothes/armor/suits/spacesuits/rigs
 2021-07-15 19:07:37 -04:00
Nadyr
3768ad7e5f Merge pull request #2545 from CHOMPStationBot/upstream-merge-11073 
[MIRROR] Make connections lists lazy
 2021-07-15 18:57:36 -04:00
Aronai Sieyes
6f7f3b8460 Merge pull request #11093 from VOREStation/Arokha/emptynear 
Allow emptying contents from nearby bags
 2021-07-15 19:04:20 +00:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Aronai Sieyes
5c5aaa1887 Merge pull request #11058 from VOREStation/Arokha/entertain 
Make tvcamera and entertainment monitor FANCY
 2021-07-14 18:39:39 +00:00
Aronai Sieyes
bb6f219db6 Merge pull request #11073 from VOREStation/Arokha/connless 
Make connections lists lazy
 2021-07-14 18:37:22 +00:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Nadyr
f3ffdcb4ec Merge pull request #2503 from CHOMPStationBot/upstream-merge-11015 
[MIRROR] Port a big blast door, add to ship
 2021-07-13 22:59:15 -04:00
Nadyr
19b0e94af7 Merge pull request #2510 from CHOMPStationBot/upstream-merge-11025 
[MIRROR] Fix crafting menu, add plant fiber crafting things
 2021-07-13 22:59:04 -04:00
Nadyr
28b4a57852 Merge pull request #2529 from CHOMPStationBot/upstream-merge-11050 
[MIRROR] Add RSF to autolathes
 2021-07-13 22:55:11 -04:00
Nadyr
acc7d80190 Merge pull request #2527 from CHOMPStationBot/upstream-merge-11042 
[MIRROR] Storage alt-click support
 2021-07-13 22:53:47 -04:00
Nadyr
c22bbacc65 Merge pull request #2526 from CHOMPStationBot/upstream-merge-11043 
[MIRROR] Make UAVs not work at impossible distances
 2021-07-13 22:53:27 -04:00
Nadyr
c479cf6459 Merge branch 'master' into upstream-merge-11015 2021-07-13 22:25:02 -04:00
Nadyr
a803e5175f Merge pull request #2493 from CHOMPStationBot/upstream-merge-11002 
[MIRROR] Move like every clothing icon file
 2021-07-13 22:21:08 -04:00