cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-29 18:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,093 Commits 13 Branches 0 Tags
3ca4336586b0ca7f0bf92bbc4ec3fb81eb7c7b34
Commit Graph

5981 Commits

Author SHA1 Message Date
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
Aronai Sieyes
bb53b874df Merge pull request #10781 from VOREStation/Arokha/erisitems 
Port Eris random items
 2021-07-03 20:14:30 +00:00
Razgriz
1b9d60be6c Update storage.dm 2021-07-03 00:27:01 -07:00
Nadyr
18395abbe7 Merge pull request #2314 from CHOMPStationBot/upstream-merge-10769 
[MIRROR] Allows removing items from storage easier
 2021-07-01 21:31:51 -04:00
Nadyr
e2ef6972b6 Merge pull request #2312 from CHOMPStationBot/upstream-merge-10761 
[MIRROR] Add ghostjoin VV helper
 2021-07-01 21:30:58 -04:00
Nadyr
e18d99d3e1 Merge pull request #2311 from CHOMPStationBot/upstream-merge-10752 
[MIRROR] The One Where You Can Aim Lights
 2021-07-01 21:30:46 -04:00
Nadyr
8171e7736b Merge pull request #2303 from CHOMPStationBot/upstream-merge-10775 
[MIRROR] [MIRROR] Halves Item Slowdown Effects
 2021-07-01 21:30:30 -04:00
Nadyr
c977771efb powder that makes you say yes 2021-07-01 21:08:23 -04:00
Aronai Sieyes
04c88a9ec1 Merge pull request #10769 from VOREStation/Arokha/storageclick 
Allows removing items from storage easier
 2021-06-30 19:37:06 +00:00
Aronai Sieyes
97ff98adf1 Merge pull request #10761 from VOREStation/Arokha/denhelp 
Add ghostjoin VV helper
 2021-06-30 19:30:48 +00:00
Chompstation Bot
15fd9df408 The One Where You Can Aim Lights 2021-06-30 19:29:41 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
c97b47de72 [MIRROR] Halves Item Slowdown Effects 2021-06-28 11:32:00 +00:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727 
[MIRROR] Medicine Tweaks
 2021-06-26 13:24:46 -07:00
Razgriz
52d29d42bb Merge pull request #1955 from CHOMPStationBot/upstream-merge-9969 
[MIRROR] Adds in Booze hounds.
 2021-06-26 13:23:49 -07:00
Razgriz
bdb955feff stop pUTTING CHOMP ICONS IN VR FILES 2021-06-25 01:29:32 -07:00
Razgriz
45c9f96537 POWDER THAT MAKES YOU SAY YW 2021-06-24 18:46:26 -07:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Razgriz
096246abff Merge pull request #2247 from cadyn/upstream-merge-10476 
Manual Mirror Vorestation #10476
 2021-06-20 17:14:14 -07:00