cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-17 04:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,259 Commits 8 Branches 0 Tags
f58a3c742bdff8affc266ab45ede9780ccbd4025
Commit Graph

2368 Commits

Author SHA1 Message Date
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
Chompstation Bot
087c7b63be [MIRROR] Refactors posters to use decls 2021-06-21 02:22:59 +00:00
Aronai Sieyes
ac00965e68 cock 2021-06-19 22:03:38 -07:00
Razgriz
fe6a182d07 Merge pull request #2228 from CHOMPStationBot/upstream-merge-10684 
[MIRROR] Fixes Field Medic Lockers
 2021-06-18 19:11:42 -07:00
Novacat
d8bc9dec51 Merge pull request #10684 from Novacat/nova-basicfixes 
Fixes Field Medic Lockers
 2021-06-18 18:02:30 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Nadyr
1e889a1928 Merge pull request #2171 from CHOMPStationBot/upstream-merge-10615 
[MIRROR] Explo/SAR Locker Tweak
 2021-06-11 15:23:04 -04:00
Nadyr
b72fbd7861 Merge pull request #2157 from Verkister/maintpreddies 
Adds more mobs to maint pred options.
 2021-06-11 15:22:10 -04:00
Aronai Sieyes
2748b83176 Merge pull request #10615 from KillianKirilenko/kk-fixes 
Explo/SAR Locker Tweak
 2021-06-11 19:12:38 +00:00
Nadyr
d43aef3cea Merge pull request #2129 from BlackMajor/bigdragon 
New mob: Large Dragon, and some changes.
 2021-06-09 18:35:02 -04:00
BlackMajor
95451ea9c5 Update event_vr.dm 2021-06-10 09:23:35 +12:00
Verkister
2b879c2a05 Adds more mobs to maint pred options. 
-Added fox, syndi-fox, raccoon, cat, lizardman, direwolf, diredog, hyena, chubby oties (base/mutated/red), and zorgoia.
 2021-06-09 12:08:31 +03:00
Aronai Sieyes
666786d4b7 Merge pull request #10594 from VOREStation/Arokha/paradoors 
Ports Paradise pod doors
 2021-06-09 00:45:09 +00:00
Aronai Sieyes
6d2fe93052 Merge pull request #10567 from VOREStation/upstream-merge-8104 
[MIRROR] Adds new rocks + resprites mining outcrops
 2021-06-07 05:08:55 +00:00
BlackMajor
58d669bdae Merge branch 'master' into bigdragon 2021-06-04 15:37:20 +12:00
BlackMajor
a373a4177d Missed a thing 2021-06-04 15:13:57 +12:00
Nadyr
752123834b Merge pull request #2107 from CHOMPStationBot/upstream-merge-10518 
[MIRROR] Ports musical instruments from /tg/
 2021-06-02 02:54:38 -04:00
Nadyr
59fd206160 powder that makes you say yes 2021-06-02 00:34:43 -04:00