cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,259 Commits 9 Branches 0 Tags
f58a3c742bdff8affc266ab45ede9780ccbd4025
Commit Graph

2442 Commits

Author SHA1 Message Date
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Chompstation Bot
0851b4f14c Takes Stellar Delight apart 2021-11-01 21:58:31 +00:00
Nadyr
14bb170e1e Merge branch 'master' into upstream-merge-11730 2021-10-30 23:14:48 -04:00
Chompstation Bot
0c1543dc50 Map name tweaks 2021-10-30 21:26:46 +00:00
Chompstation Bot
60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Nadyr
0a973e2ddd Merge pull request #3138 from CHOMPStationBot/upstream-merge-11698 
[MIRROR] Tool Time (Fixed)
 2021-10-27 19:14:36 -04:00
Nadyr
7d2a807b50 Merge pull request #3112 from CHOMPStationBot/upstream-merge-11642 
[MIRROR] paper masks, emotional mask
 2021-10-27 18:32:26 -04:00
Chompstation Bot
0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
Casey
660f89f864 Merge pull request #11642 from PastelPrinceDan/mask 
paper masks, emotional mask
 2021-10-27 15:23:53 +00:00
Casey
9baef0d104 Merge pull request #11641 from Heroman3003/goos-b-gun 
Removes geese from immedeate Tether surroundings
 2021-10-27 15:20:22 +00:00
Chompstation Bot
5ca0ff4c15 Update mob spawners/spawns 2021-09-24 03:22:28 +00:00
Nadyr
c8ff410f64 Merge pull request #2790 from CHOMPStationBot/upstream-merge-11396 
[MIRROR] Fix Salamanders and Wall-lockers
 2021-08-13 23:46:21 -04:00
Nadyr
ec7731c220 Merge pull request #2789 from CHOMPStationBot/upstream-merge-11391 
[MIRROR] Orange Line Upgrade
 2021-08-13 23:40:51 -04:00
Nadyr
5eed3f3616 Merge pull request #2788 from CHOMPStationBot/upstream-merge-11384 
[MIRROR] Virology Revamp
 2021-08-13 23:40:19 -04:00
Chompstation Bot
f5212e0053 Fix Salamanders and Wall-lockers 2021-08-13 15:40:58 +00:00
Chompstation Bot
9a5b473b22 Orange Line Upgrade 2021-08-13 15:39:53 +00:00
Chompstation Bot
beef8e7f82 Virology Revamp 2021-08-13 15:38:46 +00:00
Chompstation Bot
cbd1953061 Fancy Lifeboats 2021-08-13 15:38:40 +00:00
Chompstation Bot
ee735270ec Fancy exploration shuttle 2021-08-08 18:48:28 +00:00
Chompstation Bot
2967ef4416 Fancy sprited shuttles 2021-08-06 22:15:49 +00:00
Nadyr
c1256426da Merge branch 'master' into upstream-merge-11324 2021-08-01 17:49:14 -04:00
Chompstation Bot
0857ab35f3 Few more outdoors fixes 2021-08-01 16:26:38 +00:00
Chompstation Bot
4090222cda Janitor Equipment Fix 2021-08-01 14:45:35 +00:00
Chompstation Bot
d4c6afa5af Remove atom/Uncross override 2021-07-28 20:43:23 +00:00
Chompstation Bot
02af50470c 7/23/2021 Drink Revamp 2021-07-27 22:06:30 +00:00
Chompstation Bot
6df9089784 Adds medical kiosk to code/buildable 2021-07-25 22:02:18 +00:00
Chompstation Bot
f97dfc5dea More TGMC Ports 2021-07-25 21:45:48 +00:00
Chompstation Bot
73086eb5cf Small changes to AI Core 2021-07-23 20:27: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
e39c3b02ee Merge pull request #2616 from CHOMPStationBot/upstream-merge-11180 
[MIRROR] Update gateways
 2021-07-20 21:09:59 -04:00
Nadyr
744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -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
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
cf4df39047 Update gateways 2021-07-20 21:30:13 +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
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
7a4a6d8391 Merge branch 'master' into upstream-merge-11020 2021-07-13 22:45:28 -04:00
Chompstation Bot
e4849dbd25 Make v3b show up for ships nearby on overmap 2021-07-11 19:14:24 +00:00
Chompstation Bot
d9cb00a124 Add skybox planet sprite for Virgo3b, modify midpoint 2021-07-10 23:48:50 +00:00
Nadyr
b75fc136c1 Merge pull request #2465 from CHOMPStationBot/upstream-merge-10969 
[MIRROR] Make the sun bleed even better
 2021-07-10 00:35:16 -04:00
Nadyr
211ed134b5 Merge branch 'CHOMPStation2:master' into upstream-merge-10952 2021-07-09 23:44:53 -04:00
Chompstation Bot
9a9da55cd2 Make the sun bleed even better 2021-07-08 04:54:20 +00:00
Chompstation Bot
a592e4e83d Replaces monofloors with a decal and makes some floors not rotated 2021-07-07 23:43:43 +00:00
Chompstation Bot
1513fbe0cb SSInput and Diagonal Movement 2021-07-07 18:35:44 +00:00
Aronai Sieyes
e9cb44d9ca Merge pull request #10898 from Heroman3003/incorporeal-fires 
Makes incorporeal things properly immune to bonfires and lava (and tram and elevator...)
 2021-07-05 20:26:01 +00:00
Chompstation Bot
70167dde60 Add painting tools for more ART 2021-07-05 16:40:36 +00:00
Razgriz
04317096ff Merge pull request #2368 from CHOMPStationBot/upstream-merge-10831 
[MIRROR] Further Map Changes
 2021-07-03 16:50:15 -07:00
Chompstation Bot
ea9582b5b1 Further Map Changes 2021-07-03 21:15:08 +00:00
Chompstation Bot
877b582a85 Replace all the overmap icons 2021-07-03 20:34:03 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00