Commit Graph

62550 Commits

Author SHA1 Message Date
Verkister
1a1756c28a Non-broken PR for despawner gorepods
Mirrorbot committed a fucky wucky
2021-03-21 20:26:33 +02:00
Nadyr
7e2890409e Merge pull request #1633 from CHOMPStationBot/upstream-merge-9944
[MIRROR] Fix Missing DSI Roboparts
2021-03-21 05:26:00 -04:00
Nadyr
93100c6d00 Merge pull request #1623 from CHOMPStationBot/upstream-merge-9956
[MIRROR] [MIRROR] Ported Poppy the possum.
2021-03-21 05:17:47 -04:00
Nadyr
5fc2ffbee7 Merge branch 'master' into upstream-merge-9944 2021-03-21 05:15:17 -04:00
Nadyr
5e99c01097 Merge pull request #1618 from CHOMPStationBot/upstream-merge-9961
[MIRROR] [MIRROR] Fixes Global and Fixes Eyes
2021-03-21 05:06:41 -04:00
Nadyr
91bac24d59 Merge pull request #1627 from CHOMPStationBot/upstream-merge-9971
[MIRROR] Adds Poppy to engineering
2021-03-21 05:01:14 -04:00
Nadyr
497d86166a Add files via upload 2021-03-21 04:59:30 -04:00
Nadyr
29d7bd704f Merge pull request #1624 from CHOMPStationBot/upstream-merge-9958
[MIRROR] [MIRROR] Clicking on turfs while dragging something no longer closes the door
2021-03-21 04:54:56 -04:00
Nadyr
16b8fc040c Update standard.dm 2021-03-21 04:49:12 -04:00
Nadyr
a7d14dc85c Update sound.dm 2021-03-21 04:45:00 -04:00
Nadyr
de07a4e79d Merge branch 'master' into upstream-merge-9961 2021-03-21 04:34:39 -04:00
Nadyr
5b1aa3dc20 Merge pull request #1611 from CHOMPStationBot/upstream-merge-9951
[MIRROR] Fixes prefless carbonmobs defaulting to fuzzy mode
2021-03-21 04:32:21 -04:00
Nadyr
c8321a53df Merge pull request #1617 from CHOMPStationBot/upstream-merge-9960
[MIRROR] [MIRROR] Added Doctress' Jager drink.
2021-03-21 04:31:54 -04:00
Nadyr
d30b84896a Merge pull request #1602 from CHOMPStationBot/upstream-merge-9938
[MIRROR] Makes shadekin not have glowing eyes by default
2021-03-21 04:30:37 -04:00
Nadyr
32478ad95b Merge pull request #1598 from CHOMPStationBot/upstream-merge-9933
[MIRROR] Fixes vermin infestation event not working right sometimes
2021-03-21 04:29:05 -04:00
Nadyr
5e403b1797 Merge pull request #1597 from CHOMPStationBot/upstream-merge-9932
[MIRROR] Fixes char setup failing to update sizes/shapes
2021-03-21 04:27:42 -04:00
Nadyr
0cf5eaab38 Merge pull request #1594 from CHOMPStationBot/upstream-merge-9928
[MIRROR] [BUG] Size update fixes
2021-03-21 04:23:51 -04:00
Nadyr
ac3069a8bf Merge branch 'master' into upstream-merge-9951 2021-03-21 04:21:49 -04:00
Nadyr
7abbcfd1ab Merge pull request #1593 from CHOMPStationBot/upstream-merge-9926
[MIRROR] FIXES EYES
2021-03-21 04:18:23 -04:00
Nadyr
fe2b26c4d9 Merge branch 'master' into upstream-merge-9932 2021-03-21 04:17:12 -04:00
Nadyr
eca4718bdc Update Chemistry-Reagents-Vore_vr.dm 2021-03-21 04:13:47 -04:00
Nadyr
e3622cd0a9 Update Chemistry-Reagents-Vore_vr.dm 2021-03-21 04:12:26 -04:00
Nadyr
699b554e46 Merge pull request #1592 from CHOMPStationBot/upstream-merge-9924
[MIRROR] Fixes Custom Species Base Selection
2021-03-21 04:08:15 -04:00
Nadyr
05bcc67beb Update standard_vr.dm 2021-03-21 04:07:41 -04:00
Nadyr
63ac2eff35 Merge branch 'master' into upstream-merge-9926 2021-03-21 03:59:48 -04:00
Nadyr
412a246c81 Update update_icons.dm 2021-03-21 03:47:31 -04:00
Nadyr
a85ee7115f Merge branch 'master' into upstream-merge-9924 2021-03-21 03:35:47 -04:00
Nadyr
0016baf982 Merge pull request #1582 from CHOMPStationBot/upstream-merge-9327
[MIRROR] [MIRROR] Kaleidoscope 2: The Retabbening
2021-03-21 03:24:17 -04:00
Nadyr
6cde7986e5 Update vorestation.dme 2021-03-21 03:14:07 -04:00
Nadyr
0f650275d7 Update vorestation.dme 2021-03-21 03:09:39 -04:00
Nadyr
861af3c483 Update sprite_accessories_vr.dm 2021-03-21 03:00:41 -04:00
Nadyr
cc8241a403 Update sprite_accessories_vr.dm 2021-03-21 02:57:27 -04:00
Nadyr
0768856220 fuck me 2021-03-21 02:49:39 -04:00
Nadyr
0281b47f96 Update living_defines.dm 2021-03-21 02:21:46 -04:00
Nadyr
8395359d92 Update 03_body.dm 2021-03-21 02:14:02 -04:00
Nadyr
d07f2da76a Update 03_body.dm 2021-03-21 02:11:44 -04:00
Nadyr
48d8812b9e Update global_lists_vr.dm 2021-03-21 02:00:04 -04:00
Nadyr
95a2350221 Update global_lists.dm 2021-03-21 01:24:14 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Razgriz
d834f66316 Merge pull request #1600 from CHOMPStationBot/upstream-merge-9935
[MIRROR] Fixes bug with entertainer
2021-03-19 22:52:53 -07:00
Nadyr
2b2d7506b5 Merge pull request #1579 from CHOMPStationBot/upstream-merge-9914
[MIRROR] Adds configuration to idle emotes
2021-03-20 01:47:35 -04:00
Razgriz
99bbef8073 Merge pull request #1632 from Verkister/squishies
A bunch of little belly fixes.
2021-03-19 22:45:48 -07:00
Razgriz
202651b317 Merge pull request #1629 from CHOMPStationBot/upstream-merge-9973
[MIRROR] [MIRROR] Makes custom cigarettes even more custom-ier
2021-03-19 22:44:13 -07:00
Razgriz
91e6228bac Merge pull request #1626 from CHOMPStationBot/upstream-merge-9970
[MIRROR] Update Allergy Traits
2021-03-19 22:43:43 -07:00
Razgriz
a4ffe4a573 Merge pull request #1630 from CHOMPStation2/dependabot/pip/tools/mapmerge2/pillow-8.1.1
Bump pillow from 7.1.0 to 8.1.1 in /tools/mapmerge2
2021-03-19 22:43:09 -07:00
Razgriz
25e3a426b2 Merge pull request #1622 from CHOMPStationBot/upstream-merge-9965
[MIRROR] [MIRROR] Fixes pilots not getting a harness if they use a loadout uniform
2021-03-19 22:42:17 -07:00
Razgriz
91d6568443 Merge pull request #1621 from CHOMPStationBot/upstream-merge-9964
[MIRROR] [MIRROR] Minor cleanup.
2021-03-19 22:41:59 -07:00
Razgriz
e854e7d8ce Merge pull request #1620 from CHOMPStationBot/upstream-merge-9968
[MIRROR] [MIRROR] GPS presentation/update tweaks/fixes.
2021-03-19 22:41:29 -07:00
Razgriz
426915b843 Merge pull request #1619 from CHOMPStationBot/upstream-merge-9962
[MIRROR] [MIRROR] Ghosts now use their body appearance initially.
2021-03-19 22:41:04 -07:00
Razgriz
91696b323b Merge pull request #1616 from CHOMPStationBot/upstream-merge-9967
[MIRROR] [MIRROR] Examining dark click catcher doesn't show turfs
2021-03-19 22:40:15 -07:00