cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 09:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,883 Commits 8 Branches 0 Tags
fdf4e56451cf720a7c1643ddeec73476f0f120d3
Commit Graph

9606 Commits

Author SHA1 Message Date
Aronai Sieyes
fdf4e56451 Merge pull request #10862 from VOREStation/Icons/moredeco 
More decorations, fancy suit dispenser, angry generator
 2021-07-04 04:29:52 +00:00
Chompstation Bot
275458f14a Port in-game painting from /tg/ 2021-07-03 22:31:15 -04: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
23a4648f87 Merge pull request #2382 from CHOMPStationBot/upstream-merge-10854 
[MIRROR] Fix indentation
 2021-07-03 21:22:19 -04:00
Nadyr
9ac6347212 Merge pull request #2381 from CHOMPStationBot/upstream-merge-10846 
[MIRROR] Make smol holders use vis_contents
 2021-07-03 21:19:12 -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
b53f03dde4 Merge pull request #2379 from CHOMPStationBot/upstream-merge-10835 
[MIRROR] Ports lots of sprites for decoration purposes
 2021-07-03 21:13:28 -04:00
Nadyr
d4d23c69d9 Merge branch 'master' into upstream-merge-10854 2021-07-03 21:12:40 -04:00
Nadyr
e31f2ca7e8 Merge pull request #2356 from CHOMPStationBot/upstream-merge-10814 
[MIRROR] Ports TG posters and adds some new ones too!
 2021-07-03 21:06:07 -04:00
Nadyr
4bed07bf86 Merge branch 'master' into upstream-merge-10835 2021-07-03 21:02:14 -04:00
Nadyr
8e4dee91f4 powder that makes you say yes 2021-07-03 20:55:23 -04:00
Nadyr
b7d74c15de powder that makes you say yes 2021-07-03 20:54:42 -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
ec58ac4d70 Merge pull request #2364 from CHOMPStationBot/upstream-merge-10821 
[MIRROR] Add pews, corp sofas
 2021-07-03 16:59:16 -07:00
Razgriz
00cc57a5f5 Merge pull request #2378 from CHOMPStationBot/upstream-merge-10825 
[MIRROR] /tg/ stools, fix stool code
 2021-07-03 16:57:16 -07: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
9a9937992c Merge pull request #2365 from CHOMPStationBot/upstream-merge-10820 
[MIRROR] /tg/ and TGMC sinks, toilets, replace mirror
 2021-07-03 16:52:36 -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
e02a363adb Merge pull request #2357 from CHOMPStationBot/upstream-merge-10813 
[MIRROR] Port /tg/ fireplace sprites
 2021-07-03 16:41:39 -07:00
Chompstation Bot
0fe8795a1f Fix indentation 2021-07-03 23:30:45 +00: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
f442526de1 Merge pull request #2352 from CHOMPStationBot/upstream-merge-10809 
[MIRROR] Port some /tg/ barsigns
 2021-07-03 14:40:20 -07:00
Chompstation Bot
dc23e61411 Make smol holders use vis_contents 2021-07-03 21:38:55 +00:00
Chompstation Bot
1d0e509ba9 Ports lots of sprites for decoration purposes 2021-07-03 21:37:42 +00: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
Chompstation Bot
f300e5edcc /tg/ stools, fix stool code 2021-07-03 21:24:23 +00: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
ce7d94538e Merge pull request #2340 from CHOMPStationBot/upstream-merge-10798 
[MIRROR] Space heater and porta scrub icons
 2021-07-03 14:10:03 -07: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
Razgriz
cb14bd112e Merge pull request #2333 from CHOMPStationBot/upstream-merge-10781 
[MIRROR] Port Eris random items
 2021-07-03 13:54:45 -07:00
Aronai Sieyes
c8b4d9c854 Merge pull request #10820 from VOREStation/Icons/sinks 
/tg/ and TGMC sinks, toilets, replace mirror
 2021-07-03 20:44:23 +00:00
Aronai Sieyes
44fff8dfae Merge pull request #10821 from VOREStation/Icons/sofas 
Add pews, corp sofas
 2021-07-03 20:44:16 +00: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
0bf04e440a Merge pull request #10813 from VOREStation/Icons/fireplace 
Port /tg/ fireplace sprites
 2021-07-03 20:35:25 +00:00
Chompstation Bot
dd2197bd2e Ports TG posters and adds some new ones too! 2021-07-03 20:35:18 +00:00
Aronai Sieyes
2def3cfcb0 Merge pull request #10809 from VOREStation/Icons/tgbarsigns 
Port some /tg/ barsigns
 2021-07-03 20:33:50 +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
Aronai Sieyes
3f55a767d0 Merge pull request #10798 from VOREStation/Icons/portaatmos 
Space heater and porta scrub icons
 2021-07-03 20:19:18 +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