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

6101 Commits

Author SHA1 Message Date
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
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
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
27545a7859 Merge pull request #11010 from VOREStation/Arokha/qpadlink 
Fix some bugs
 2021-07-10 20:12:23 +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
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
Aronai Sieyes
205ef740bd Merge pull request #10993 from MarinaGryphon/issue/logpile 
Stack Examine Improvements, Log Examine Fix
 2021-07-09 16:19:16 +00:00
Aronai Sieyes
c495e183a8 Merge pull request #10988 from MarinaGryphon/issue/10885 
Fixes #10885
 2021-07-09 16:18:08 +00:00
Aronai Sieyes
e4692d0b94 Merge pull request #10989 from MarinaGryphon/issue/pocky 
Fixes pocky having no sprite.
 2021-07-09 16:18:00 +00:00
Aronai Sieyes
f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289 
Expands do_after/do_mob exclusive var to affect target
 2021-07-09 16:14:12 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Nadyr
a2c1ee213a Merge pull request #2433 from CHOMPStationBot/upstream-merge-10927 
[MIRROR] Add pouches!
 2021-07-05 23:32:49 -04:00
Chompstation Bot
b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Aronai Sieyes
78eb4608d2 Merge pull request #10923 from VOREStation/Arokha/mult 
Fix multitool runtime
 2021-07-05 23:57:53 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Nadyr
f9d4c77fe1 Merge pull request #2416 from CHOMPStationBot/upstream-merge-10909 
[MIRROR] Fixes a few issues with brackets being escaped when they shouldn't be.
 2021-07-05 15:56:53 -04:00
Aronai Sieyes
bcc80d1bbb Merge pull request #10909 from MarinaGryphon/bracketfixes 
Fixes a few issues with brackets being escaped when they shouldn't be.
 2021-07-05 16:17:41 +00:00
Aronai Sieyes
1fa01995cf Merge pull request #10894 from VOREStation/Arokha/3more 
Add 3 more things banned from openspace
 2021-07-05 06:40:07 +00:00
Nadyr
c21ee657fe Merge pull request #2385 from CHOMPStationBot/upstream-merge-10794 
[MIRROR] Port various backpacks
 2021-07-03 21:40:25 -04:00
Nadyr
24fd91203f Merge pull request #2388 from CHOMPStationBot/upstream-merge-10780 
[MIRROR] Port Eris grenade sprites
 2021-07-03 21:18:06 -04:00
Nadyr
6660a70e82 Merge pull request #2387 from CHOMPStationBot/upstream-merge-10782 
[MIRROR] Port Eris Trashbag of Holding
 2021-07-03 21:17:31 -04:00
Nadyr
55b85e0ccf Merge pull request #2386 from CHOMPStationBot/upstream-merge-10789 
[MIRROR] Port Bay microwave, utensil/kitchen knife sprites
 2021-07-03 21:16:45 -04:00
Nadyr
27ca2cdda6 Merge pull request #2373 from CHOMPStationBot/upstream-merge-10842 
[MIRROR] More glowy
 2021-07-03 20:48:07 -04:00
Aronai Sieyes
972bcbda4b Merge pull request #10780 from VOREStation/Arokha/erisgrenades 
Port Eris grenade sprites
 2021-07-04 00:38:22 +00:00
Aronai Sieyes
ce2cbc8ae2 Merge pull request #10782 from VOREStation/Arokha/trashholding 
Port Eris Trashbag of Holding
 2021-07-04 00:38:17 +00:00
Aronai Sieyes
5e675845de Merge pull request #10789 from VOREStation/Arokha/eriskitchen 
Port Bay microwave, utensil/kitchen knife sprites
 2021-07-04 00:38:10 +00:00
Chompstation Bot
e0ff2b4ffe Port various backpacks 2021-07-04 00:38:04 +00:00
Razgriz
d6a2983dd2 Merge pull request #2377 from CHOMPStationBot/upstream-merge-10843 
[MIRROR] Fix flashlight off clicks
 2021-07-03 16:56:33 -07:00
Razgriz
1ed4d7d336 Merge pull request #2363 from CHOMPStationBot/upstream-merge-10823 
[MIRROR] Some Eris toys, /tg/ mecha toy icons
 2021-07-03 16:49:08 -07:00
Razgriz
178a7183b9 Merge pull request #2360 from CHOMPStationBot/upstream-merge-10818 
[MIRROR] Replace my terrible UAV sprite
 2021-07-03 16:43:01 -07:00
Razgriz
1a3c753f4a Merge pull request #2346 from CHOMPStationBot/upstream-merge-10802 
[MIRROR] Port several foods and food sprites
 2021-07-03 14:49:34 -07:00
Razgriz
2441163c4c Merge pull request #2344 from CHOMPStationBot/upstream-merge-10792 
[MIRROR] Eris portable freezer, medical briefcase
 2021-07-03 14:27:19 -07:00
Aronai Sieyes
165756365b Merge pull request #10843 from VOREStation/Arokha/flashfix 
Fix flashlight off clicks
 2021-07-03 21:22:15 +00:00
Chompstation Bot
ca63950725 More glowy 2021-07-03 21:20:48 +00:00
Razgriz
fe89786213 Merge pull request #2338 from CHOMPStationBot/upstream-merge-10791 
[MIRROR] Port Eris mining satchel sprites, satchel of holding
 2021-07-03 14:09:30 -07:00
Aronai Sieyes
d7283c9011 Merge pull request #10823 from VOREStation/Icons/toys 
Some Eris toys, /tg/ mecha toy icons
 2021-07-03 20:44:10 +00:00
Aronai Sieyes
29a61fe048 Merge pull request #10818 from VOREStation/Icons/uav 
Replace my terrible UAV sprite
 2021-07-03 20:36:45 +00:00
Aronai Sieyes
64db1a458b Merge pull request #10802 from VOREStation/Icons/food 
Port several foods and food sprites
 2021-07-03 20:31:07 +00:00
Aronai Sieyes
30a01c6490 Merge pull request #10792 from VOREStation/Arokha/portamed 
Eris portable freezer, medical briefcase
 2021-07-03 20:26:49 +00:00
Chompstation Bot
42cbf0e1e5 Port Eris mining satchel sprites, satchel of holding 2021-07-03 20:17:02 +00:00