cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-11 18:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,178 Commits 7 Branches 0 Tags
d9cb00a124c03ae4e5d94968fd21b5071550194d
Commit Graph

2285 Commits

Author SHA1 Message Date
Chompstation Bot
d9cb00a124 Add skybox planet sprite for Virgo3b, modify midpoint 2021-07-10 23:48:50 +00: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
Nadyr
d9dd108539 Merge pull request #2466 from CHOMPStationBot/upstream-merge-10963 
[MIRROR] Byond will never stop with this huh
 2021-07-10 00:45:05 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04: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
Aronai Sieyes
22e6adb253 Merge pull request #10963 from VOREStation/Arokha/artREALLY 
Byond will never stop with this huh
 2021-07-08 04:54:26 +00:00
Nadyr
7438d0f486 Merge pull request #2453 from CHOMPStationBot/upstream-merge-10948 
[MIRROR] Adds a weretiger.
 2021-07-08 00:15:00 -04:00
Nadyr
2c1005a60f Merge pull request #2448 from CHOMPStationBot/upstream-merge-10937 
[MIRROR] Some plane tweaks.
 2021-07-08 00:14:47 -04:00
Nadyr
70fcf38987 powder that makes you say yes 2021-07-07 23:58:56 -04:00
Nadyr
8b67f6b69d Merge pull request #2451 from CHOMPStationBot/upstream-merge-10949 
[MIRROR] More painting tweaks
 2021-07-07 23:56:53 -04:00
Nadyr
21aa0be248 Merge pull request #2444 from CHOMPStationBot/upstream-merge-10938 
[MIRROR] Art removal tweaks
 2021-07-07 23:52:59 -04:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Aronai Sieyes
a0b482e956 Merge pull request #10949 from VOREStation/Arokha/persistcross 
More painting tweaks
 2021-07-07 21:07:31 +00:00
Chompstation Bot
ef79e49ee2 Some plane tweaks. 2021-07-07 19:03:14 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
7c93723da5 Merge pull request #10938 from VOREStation/Arokha/paint 
Art removal tweaks
 2021-07-07 18:41:21 +00:00
Aronai Sieyes
1deccaed87 Merge pull request #10931 from Very-Soft/ghostlyanimals 
Makes ghosts able to play as some mobs sometimes
 2021-07-07 18:37:53 +00:00
Nadyr
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 Sieyes
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
Chompstation Bot
70167dde60 Add painting tools for more ART 2021-07-05 16:40:36 +00:00
Nadyr
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 Sieyes
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 Sieyes
964e37a020 Merge pull request #10878 from VOREStation/Fixes/10876 
Fix canvas sprites
 2021-07-04 22:46:31 +00:00
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
23a4648f87 Merge pull request #2382 from CHOMPStationBot/upstream-merge-10854 
[MIRROR] Fix indentation
 2021-07-03 21:22:19 -04:00
Nadyr
d4d23c69d9 Merge branch 'master' into upstream-merge-10854 2021-07-03 21:12:40 -04:00
Nadyr
4bed07bf86 Merge branch 'master' into upstream-merge-10835 2021-07-03 21:02:14 -04: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
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
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
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
1d0e509ba9 Ports lots of sprites for decoration purposes 2021-07-03 21:37:42 +00:00
Chompstation Bot
f300e5edcc /tg/ stools, fix stool code 2021-07-03 21:24:23 +00: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
0bf04e440a Merge pull request #10813 from VOREStation/Icons/fireplace 
Port /tg/ fireplace sprites
 2021-07-03 20:35:25 +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
a6f23e09f2 Merge pull request #10785 from VOREStation/Arokha/burnbarrel 
Port Eris burning barrels
 2021-07-03 20:14:25 +00:00
Razgriz
e3a9cd3775 Merge branch 'master' into upstream-merge-10764 2021-07-03 00:26:13 -07:00
Nadyr
7714b87e43 powder that makes you say yes 2021-07-01 19:31:10 -04:00
Chompstation Bot
bf04ca9003 Port /tg/ vis_contents openspace 2021-06-30 19:49:25 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727 
[MIRROR] Medicine Tweaks
 2021-06-26 13:24:46 -07:00
Verkister
8d0899b925 Fixes shower overlays 
Mirrorbot whoopsied again.
 2021-06-25 13:56:13 +03: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