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,349 Commits 6 Branches 0 Tags
3d2783aec7afffbc847941387e445184fcf23f97
Commit Graph

19128 Commits

Author SHA1 Message Date
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Nadyr
fc25bdef94 Merge pull request #2555 from CHOMPStationBot/upstream-merge-11092 
[MIRROR] Fixes #11005
 2021-07-15 19:21:44 -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
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
4983148996 Merge pull request #11092 from VOREStation/Fixes/11005 
Fixes #11005
 2021-07-15 19:04:26 +00: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
Nadyr
6558985fcb Merge pull request #2547 from CHOMPStationBot/upstream-merge-11058 
[MIRROR] Make tvcamera and entertainment monitor FANCY
 2021-07-14 22:48:30 -04:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Nadyr
105c6abc66 Merge pull request #2540 from CHOMPStationBot/upstream-merge-11066 
[MIRROR] Fixes #11027
 2021-07-14 22:39:17 -04:00
Nadyr
851b9a7a6c Merge pull request #2537 from Shadowfire117/dispensertguicaretaking 
New Wheel of Fortune
 2021-07-14 22:21:12 -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
Aronai Sieyes
41a227cde8 Merge pull request #11066 from MarinaGryphon/bugfix/11027 
Fixes #11027
 2021-07-14 17:48:59 +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
14f27ef762 Merge pull request #2516 from CHOMPStationBot/upstream-merge-11035 
[MIRROR] [MIRROR] Cold cavern tileset.
 2021-07-13 22:50:00 -04:00
Nadyr
5845389662 Merge pull request #2509 from CHOMPStationBot/upstream-merge-11019 
[MIRROR] Allow decon of plating by welder
 2021-07-13 22:45:53 -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
Nadyr
1b0ff7eeeb Merge pull request #2504 from CHOMPStationBot/upstream-merge-11017 
[MIRROR] Fix railing clipping with flight
 2021-07-13 21:35:00 -04:00
Shadowfire
69323319fb New Wheel of Fortune 
Made a new grander and more attention grabbing wheel of fortune sprite.
Remade code so now it does public spins, and it handles sale of lottery tickets itself. Staff with right access can enable/disable public spin and sales, reset lottery and of course do a roll of the wheel for the lottery

Good luck everyone!
 2021-07-13 23:44:06 +02:00
Nadyr
31823707a7 powder that makes you say yes 2021-07-12 23:31:31 -04:00
Aronai Sieyes
8faa3a57ce Merge pull request #11050 from VOREStation/Arokha/rsf 
Add RSF to autolathes
 2021-07-12 23:47:42 +00:00
Aronai Sieyes
54af7b4f8a Merge pull request #11042 from VOREStation/Arokha/altstorage 
Storage alt-click support
 2021-07-12 23:46:27 +00:00
Aronai Sieyes
85b0fbdd30 Merge pull request #11043 from VOREStation/Arokha/uavview 
Make UAVs not work at impossible distances
 2021-07-12 23:46:20 +00:00
Aronai Sieyes
7ecbc25c97 Merge pull request #11035 from VOREStation/upstream-merge-8166 
[MIRROR] Cold cavern tileset.
 2021-07-12 06:41:16 +00:00
Chompstation Bot
50dd8ad121 Fix crafting menu, add plant fiber crafting things 2021-07-11 19:16:38 +00:00
Aronai Sieyes
b2d3171046 Merge pull request #11019 from VOREStation/Arokha/platingdecon 
Allow decon of plating by welder
 2021-07-11 19:14:30 +00:00
Aronai Sieyes
9e13177d81 Merge pull request #11017 from VOREStation/Arokha/flyclip 
Fix railing clipping with flight
 2021-07-11 00:45:52 +00:00
Chompstation Bot
1e95d78a1a Port a big blast door, add to ship 2021-07-10 23:49:57 +00:00
Chompstation Bot
d9cb00a124 Add skybox planet sprite for Virgo3b, modify midpoint 2021-07-10 23:48:50 +00:00
Nadyr
58f6f5a71a Merge pull request #2499 from CHOMPStationBot/upstream-merge-11010 
[MIRROR] Fix some bugs
 2021-07-10 18:47:04 -04:00
Aronai Sieyes
27545a7859 Merge pull request #11010 from VOREStation/Arokha/qpadlink 
Fix some bugs
 2021-07-10 20:12:23 +00:00
Aronai Sieyes
6ba41ed8e0 Merge pull request #11006 from VOREStation/Arokha/portalfix 
Remove naughty KEEP_TOGETHER
 2021-07-10 19:35:22 +00:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Nadyr
b90a37b854 Merge pull request #2490 from CHOMPStationBot/upstream-merge-10995 
[MIRROR] Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-10 01:47:51 -04:00
Nadyr
60fa095962 Merge pull request #2488 from CHOMPStationBot/upstream-merge-10993 
[MIRROR] Stack Examine Improvements, Log Examine Fix
 2021-07-10 01:47:29 -04:00
Nadyr
48c609ddca Merge pull request #2487 from CHOMPStationBot/upstream-merge-10988 
[MIRROR] Fixes #10885
 2021-07-10 01:38:31 -04:00
Nadyr
c229da42a6 Merge pull request #2486 from CHOMPStationBot/upstream-merge-10989 
[MIRROR] Fixes pocky having no sprite.
 2021-07-10 01:36:36 -04:00
Nadyr
49866902a7 Merge pull request #2479 from CHOMPStationBot/upstream-merge-10980 
[MIRROR] Expands do_after/do_mob exclusive var to affect target
 2021-07-10 01:30:52 -04:00
Nadyr
d9dd108539 Merge pull request #2466 from CHOMPStationBot/upstream-merge-10963 
[MIRROR] Byond will never stop with this huh
 2021-07-10 00:45:05 -04:00
Nadyr
211ed134b5 Merge branch 'CHOMPStation2:master' into upstream-merge-10952 2021-07-09 23:44:53 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04:00
Nadyr
627bc202a1 powder that makes you say yes 2021-07-09 21:47:50 -04:00
Nadyr
9a4fd9b210 powder that makes you say yes 2021-07-09 21:38:48 -04:00
Novacat
29b5b3bf05 Merge pull request #10995 from Enzo-Leon/medical_tools 
Properly Adds Bio-Regenerator to Surgery Bag
 2021-07-09 18:24:29 +00:00