cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
64,968 Commits 13 Branches 0 Tags
0f1745dd3f5f0ac3b55efb11eefea17c439ee5b9
Commit Graph
9621 Commits
Author SHA1 Message Date
NadyrandGitHub 0f1745dd3f Merge pull request #2423 from CHOMPStationBot/upstream-merge-10908 
[MIRROR] Converts visible_message notice spans to look more like emotes
 2021-07-05 18:43:53 -04:00
Chompstation Bot 14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Aronai SieyesandChompstation Bot e9cb44d9ca Merge pull request #10898 from Heroman3003/incorporeal-fires 
Makes incorporeal things properly immune to bonfires and lava (and tram and elevator...)
 2021-07-05 20:26:01 +00:00
NadyrandGitHub 568906d03c Merge pull request #2421 from CHOMPStationBot/upstream-merge-10911 
[MIRROR] Add painting tools for more ART
 2021-07-05 16:05:43 -04:00
NadyrandGitHub 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
NadyrandGitHub 9f7068ac6b Merge pull request #2415 from CHOMPStationBot/upstream-merge-10894 
[MIRROR] Add 3 more things banned from openspace
 2021-07-05 15:56:20 -04:00
Chompstation Bot 70167dde60 Add painting tools for more ART 2021-07-05 16:40:36 +00:00
Aronai SieyesandChompstation Bot 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 SieyesandChompstation Bot 1fa01995cf Merge pull request #10894 from VOREStation/Arokha/3more 
Add 3 more things banned from openspace
 2021-07-05 06:40:07 +00:00
Aronai SieyesandChompstation Bot 9ed85ecb72 Merge pull request #10888 from VOREStation/Fixes/invweird 
Revert items.dm change
 2021-07-05 06:32:37 +00:00
NadyrandGitHub 138e9b65a2 Merge pull request #2406 from CHOMPStationBot/upstream-merge-10867 
[MIRROR] Fix excessive table merge, convert climbers lazy
 2021-07-04 19:15:07 -04:00
Aronai SieyesandChompstation Bot c30f4c2dbc Merge pull request #10867 from VOREStation/Fixes/10787 
Fix excessive table merge, convert climbers lazy
 2021-07-04 22:48:12 +00:00
Aronai SieyesandChompstation Bot 964e37a020 Merge pull request #10878 from VOREStation/Fixes/10876 
Fix canvas sprites
 2021-07-04 22:46:31 +00:00
NadyrandGitHub 70f951b691 Merge pull request #2398 from CHOMPStationBot/upstream-merge-10862 
[MIRROR] More decorations, fancy suit dispenser, angry generator
 2021-07-04 16:10:02 -04:00
Aronai SieyesandChompstation Bot fdf4e56451 Merge pull request #10862 from VOREStation/Icons/moredeco 
More decorations, fancy suit dispenser, angry generator
 2021-07-04 04:29:52 +00:00
Aronai SieyesandChompstation Bot d87b3c84e5 Merge pull request #10859 from VOREStation/Arokha/iconfixes 
Random item missing sprites
 2021-07-04 03:17:27 +00:00
Chompstation BotandDarlantan 275458f14a Port in-game painting from /tg/ 2021-07-03 22:31:15 -04:00
NadyrandGitHub c21ee657fe Merge pull request #2385 from CHOMPStationBot/upstream-merge-10794 
[MIRROR] Port various backpacks
 2021-07-03 21:40:25 -04:00
NadyrandGitHub 23a4648f87 Merge pull request #2382 from CHOMPStationBot/upstream-merge-10854 
[MIRROR] Fix indentation
 2021-07-03 21:22:19 -04:00
NadyrandGitHub 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
NadyrandGitHub 24fd91203f Merge pull request #2388 from CHOMPStationBot/upstream-merge-10780 
[MIRROR] Port Eris grenade sprites
 2021-07-03 21:18:06 -04:00
NadyrandGitHub 6660a70e82 Merge pull request #2387 from CHOMPStationBot/upstream-merge-10782 
[MIRROR] Port Eris Trashbag of Holding
 2021-07-03 21:17:31 -04:00
NadyrandGitHub 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
NadyrandGitHub 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
NadyrandGitHub d4d23c69d9 Merge branch 'master' into upstream-merge-10854 2021-07-03 21:12:40 -04:00
NadyrandGitHub 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
NadyrandGitHub 4bed07bf86 Merge branch 'master' into upstream-merge-10835 2021-07-03 21:02:14 -04:00
NadyrandGitHub 8e4dee91f4 powder that makes you say yes 2021-07-03 20:55:23 -04:00
NadyrandGitHub b7d74c15de powder that makes you say yes 2021-07-03 20:54:42 -04:00
NadyrandGitHub 27ca2cdda6 Merge pull request #2373 from CHOMPStationBot/upstream-merge-10842 
[MIRROR] More glowy
 2021-07-03 20:48:07 -04:00
Aronai SieyesandChompstation Bot 972bcbda4b Merge pull request #10780 from VOREStation/Arokha/erisgrenades 
Port Eris grenade sprites
 2021-07-04 00:38:22 +00:00
Aronai SieyesandChompstation Bot ce2cbc8ae2 Merge pull request #10782 from VOREStation/Arokha/trashholding 
Port Eris Trashbag of Holding
 2021-07-04 00:38:17 +00:00
Aronai SieyesandChompstation Bot 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
RazgrizandGitHub ec58ac4d70 Merge pull request #2364 from CHOMPStationBot/upstream-merge-10821 
[MIRROR] Add pews, corp sofas
 2021-07-03 16:59:16 -07:00
RazgrizandGitHub 00cc57a5f5 Merge pull request #2378 from CHOMPStationBot/upstream-merge-10825 
[MIRROR] /tg/ stools, fix stool code
 2021-07-03 16:57:16 -07:00
RazgrizandGitHub d6a2983dd2 Merge pull request #2377 from CHOMPStationBot/upstream-merge-10843 
[MIRROR] Fix flashlight off clicks
 2021-07-03 16:56:33 -07:00
RazgrizandGitHub 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
RazgrizandGitHub 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
RazgrizandGitHub 178a7183b9 Merge pull request #2360 from CHOMPStationBot/upstream-merge-10818 
[MIRROR] Replace my terrible UAV sprite
 2021-07-03 16:43:01 -07:00
RazgrizandGitHub 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
RazgrizandGitHub 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
RazgrizandGitHub 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
RazgrizandGitHub 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 SieyesandChompstation Bot 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