cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,425 Commits 5 Branches 0 Tags
b456b5287b3bdd2da43b51a226c1031c69efe957
Commit Graph

19144 Commits

Author SHA1 Message Date
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
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
3510ba7905 powder that makes you say yes 2021-07-15 20:38:46 -04:00
Chompstation Bot
a7e5cce5b8 Tweak various sprites 'n things 2021-07-15 20:35:01 -04: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
828e49f5b8 powder that makes you say yes 2021-07-15 19:34:33 -04:00
Nadyr
0517ba02a9 powder that makes you say yes 2021-07-15 19:32:49 -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
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
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
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
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57: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