Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Показываю магию как из 595 коммитов сделать 1 #4

Closed
wants to merge 5,124 commits into from
Closed

Показываю магию как из 595 коммитов сделать 1 #4

wants to merge 5,124 commits into from

Conversation

Kush1Push1
Copy link
Owner

About The Pull Request

Why It's Good For The Game

A Port?

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Changelog

🆑
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
wip: still being worked on
experiment: experimental
tgs: has something to do with tgs
expansion: expands on something
qol: quality of life content
/:cl:

Kush1Push1 pushed a commit that referenced this pull request Apr 19, 2023
Merge pull request #4 from LeShprotina/Фиксик1
9fe2502 
Перемап ДС2
ICE-IS-NICE and others added 27 commits November 4, 2023 14:41
@ICE-IS-NICE
Фикс ерроров с id картами. (BlueMoon-Labs#527)
ccc5b6b 
* Фикс ерроров с id картами.

da)

* И еще багфикс.

* Оказывается, проблема куда серьезнее была, и даже не я её создал.
@SmiLeYre
+
b8155e3
@SmiLeYre
Merge branch 'master' of https://github.com/BlueMoon-Labs/MOLOT-BlueM…
1834e50 
…oon-Station
@SmiLeYre
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.…
fb0d676 
…T-Station-13
@SmiLeYre
+
2a52a61
@SmiLeYre
Починил Рабские приколы.
1ab6e4a
@NopemanMcHalt
horny alt titles
e698c92 
I actually just wanted to fulfill the suggestion, but I went too far.
@NopemanMcHalt
extra
c62605d
@BlueWildrose
Merge pull request #16023 from KrissKr0ss/rename-icon-files
c9b0ded 
Renames update icons files
@Kush1Push1
Фикс (BlueMoon-Labs#530)
f982a4f
@Kush1Push1
Нерф танков клоккульта (BlueMoon-Labs#529)
44eb1b1
@SmiLeYre
Починил обновление с Цитадели, починил доступ в Отеле, вернул Протола…
b7dcb0c 
…ты на Подземный Аванпост, убрал автопунктуацию, добавил донат-приколы для Лоды.
@SmiLeYre
Починил ЦК, добавил приколы для любителей рисовать жёстка.
fba6a3e
@SmiLeYre
Канвас.
f885cef
@MosleyTheMalO
Merge pull request BlueMoon-Labs#992 from NopemanMcHalt/pr-ex/horny-a…
327dd3b 
…lt-titles

A few more horny alt titles
@SPLURT-Station-Bot
Automatic changelog generation for PR BlueMoon-Labs#992 [ci skip]
4e091c1
@actions-user
Automatic changelog compile [ci skip]
d2ebf98
@MosleyTheMalO
Merge remote-tracking branch 'upstream/master'
37bbece
Update TGS DMAPI
cd5aba2
@FelixRuin
котята и щенята не плодятся (BlueMoon-Labs#531)
e678679 
* котята и щенята не плодятся

* покрасивше
@SmiLeYre
Фиксанул лазган.
53cffcd
@SmiLeYre
Merge branch 'master' of https://github.com/BlueMoon-Labs/MOLOT-BlueM…
5d11012 
…oon-Station
@SmiLeYre
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.…
959bae6 
…T-Station-13
@SmiLeYre
Баги.
d200011
@SmiLeYre
Крио.
97906ea
@SmiLeYre
Линтерсы.
bacbee5
@SmiLeYre
+
260e622
SmiLeYre and others added 2 commits November 28, 2023 13:40
@SmiLeYre
Починил вылеты из-за > в описании персонажа. Добавил "Can Refuse in L…
8875022 
…OOC" и "Watch the OOC-notes" в Нон-Кон. Заменил первое событие от взлома Коммуникационной Консоли вызовом Одинокого Оперативника.
@Kush1Push1
Фикс хедкрабов (BlueMoon-Labs#574)
47a7097
Kush1Push1 and others added 19 commits November 28, 2023 20:34
@Kush1Push1
Дофикс отеля (BlueMoon-Labs#577)
84c0d43
@Kush1Push1
Обновление для heigh medipen (BlueMoon-Labs#575)
36581b6 
* Небольшое обновление описания сайзтула

* Ограничиваем максимальный размер от псилочетотам на 300%
@Kush1Push1
Revert "Добавил "Can Refuse in LOOC" и "Watch the OOC-notes" в Нон-Ко…
d0bfbe6 
…н." (BlueMoon-Labs#576)

This reverts commit 8875022.
@FelixRuin
Update good.dm (BlueMoon-Labs#573)
fdd569e
@SmiLeYre
+
4fbf71e
@SmiLeYre
Merge branch 'master' of https://github.com/BlueMoon-Labs/MOLOT-BlueM…
5af0a70 
…oon-Station
@SmiLeYre
Проверочное.
6c833f6
@SmiLeYre
+
0d3948a
@SmiLeYre
+
9be21eb
@SmiLeYre
Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.…
9951416 
…T-Station-13
@SmiLeYre
+
f339cb7
@SmiLeYre
+
b1cf676
@SmiLeYre
Исправляю ошибочки.
ec4ed28
@SmiLeYre
+
1c662fe
@SmiLeYre
+
578806c
@SmiLeYre
Перчатки Северной Звезды и Камбургер.
ca24fab
@SmiLeYre
+
f0b1cd8
@SmiLeYre
+
a9706b8
@SmiLeYre
+
b550055
@Kush1Push1 Kush1Push1 deleted the branch mparts November 30, 2023 21:16
@Kush1Push1 Kush1Push1 closed this Nov 30, 2023
Kush1Push1 pushed a commit that referenced this pull request Oct 17, 2024
@sheetofseaweed
Merge pull request #4 from sheetofseaweed/peace_for_admins
06a1de5 
No annoying ticket sounds
Kush1Push1 pushed a commit that referenced this pull request Oct 26, 2024
@ariaworld
Merge pull request #4 from VENUS-Station/tgs-dmapi-update
c03a7bb 
Automatic TGS DMAPI Update
Kush1Push1 pushed a commit that referenced this pull request Oct 26, 2024
@MosleyTheMalO
Squashed commit of the following:
853736a 
commit 87f439a
Author: ariaworld <[email protected]>
Date:   Wed Sep 18 00:58:37 2024 +0200

    Check in announcement system

commit fcfbd40
Author: ariaworld <[email protected]>
Date:   Wed Sep 18 00:48:20 2024 +0200

    bring back the d20 of fate with wiznerd removed

commit 3f3e267
Merge: ab2ff17 761c988
Author: ariaworld <[email protected]>
Date:   Tue Sep 17 23:54:14 2024 +0200

    Merge remote-tracking branch

commit ab2ff17
Author: ariaworld <[email protected]>
Date:   Tue Sep 17 23:45:44 2024 +0200

    Change this cyborg

commit 42481c6
Author: ariaworld <[email protected]>
Date:   Mon Sep 16 22:20:05 2024 +0200

    Fix winter

commit 9ee05b5
Author: ariaworld <[email protected]>
Date:   Mon Sep 16 16:12:05 2024 +0200

    Add randomgen maint to pubby

commit 66ecccc
Author: ariaworld <[email protected]>
Date:   Mon Sep 16 01:24:51 2024 +0200

    BEE RD CONSOLE

commit 7aef674
Author: ariaworld <[email protected]>
Date:   Mon Sep 16 00:45:27 2024 +0200

    Initial that works

commit 3c7237a
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 23:28:11 2024 +0200

    Push push

commit 6a6ffac
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 16:53:17 2024 +0200

    Let's go GAMBLING!!

commit 4a09f73
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 14:33:36 2024 +0200

    Fixpush

commit d0f9aaa
Author: Changelogs <[email protected]>
Date:   Sun Sep 15 01:49:54 2024 +0000

    Automatic changelog compile [ci skip]

commit b88d9a5
Author: VENUS Bot <[email protected]>
Date:   Sun Sep 15 01:49:14 2024 +0000

    Automatic changelog generation for PR #8 [ci skip]

commit 9c6ce6e
Merge: 74af6cc 1034322
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 03:48:39 2024 +0200

    Merge pull request #8 from VENUS-Station/apartments

    [PORT] Adds: a few more apartments to infinidorms.

commit 74af6cc
Author: Changelogs <[email protected]>
Date:   Sun Sep 15 01:34:40 2024 +0000

    Automatic changelog compile [ci skip]

commit efc76c9
Author: VENUS Bot <[email protected]>
Date:   Sun Sep 15 01:34:00 2024 +0000

    Automatic changelog generation for PR #7 [ci skip]

commit 7a12e87
Merge: b01e0f5 15dec30
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 03:33:29 2024 +0200

    Merge pull request #7 from VENUS-Station/praying

    Tries to add some safeguards to the RD console & designs.

commit 1034322
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 03:26:10 2024 +0200

    A few more apartments

commit b01e0f5
Merge: 568480f ada3d2e
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 02:04:42 2024 +0200

    Merge remote-tracking branch 'splurt/master'

commit 568480f
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 02:04:30 2024 +0200

    Merge remote-tracking branch

commit 93b1db7
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 23:51:52 2024 +0200

    +

commit e8bdc01
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 21:57:51 2024 +0200

    More based delta

commit 9368e21
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 19:36:50 2024 +0200

    Like why

commit 67b519b
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 15:53:53 2024 +0200

    Meow,,

commit 051f369
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 01:17:50 2024 +0200

    Reduce weight of electrical storm

commit 42a48e9
Author: ariaworld <[email protected]>
Date:   Fri Sep 13 23:12:01 2024 +0200

    He-hell naw!

commit eb89880
Author: ariaworld <[email protected]>
Date:   Fri Sep 13 03:21:11 2024 +0200

    Stops the linter from complaining because of this.

commit 15dec30
Author: ariaworld <[email protected]>
Date:   Fri Sep 13 03:11:22 2024 +0200

    Hope this will work

commit dd75dd1
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 23:54:19 2024 +0200

    Fuck

commit e0083a5
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 21:29:25 2024 +0200

    TGS doesn't need this

commit f01dc92
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 15:21:51 2024 +0200

    Let's get rid of this

commit 9c31d41
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 04:17:32 2024 +0200

    GOKU VS UNHOLY CODE.

commit 831992f
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 00:01:41 2024 +0200

    Remove merge conflict marker

commit a4e67cc
Author: Tivi <[email protected]>
Date:   Wed Sep 8 00:58:25 2021 +0200

    Those messages shouldn't be important for admin chat.

commit 5176ca4
Author: ariaworld <[email protected]>
Date:   Wed Sep 11 13:56:16 2024 +0200

    Fix: tries to fix lobby + forced song

commit 95b3800
Author: ariaworld <[email protected]>
Date:   Wed Sep 11 03:01:24 2024 +0200

    Fix: examine for mob damage

commit d936844
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 23:59:50 2024 +0200

    Deactivate revenant

commit 75aeea9
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 23:45:06 2024 +0200

    Forcep ushing this.

commit 073a585
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 23:02:18 2024 +0200

    Disable sentient disease

commit 547dbbe
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 22:41:26 2024 +0200

    Push

commit 973c9b4
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 22:31:50 2024 +0200

    Push push push

commit eb652ad
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 01:39:58 2024 +0200

    Fix this marginbottom

commit d2b2cb1
Author: Changelogs <[email protected]>
Date:   Mon Sep 9 21:37:04 2024 +0000

    Automatic changelog compile [ci skip]

commit 889c9ce
Author: VENUS Bot <[email protected]>
Date:   Mon Sep 9 21:36:23 2024 +0000

    Automatic changelog generation for PR #6 [ci skip]

commit d9579ac
Merge: aef9e98 e4f528e
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 23:35:47 2024 +0200

    Merge pull request #6 from VENUS-Station/randomgen-maint

    Adds 193 random-gen Maintenance Ruins to Box Station

commit e4f528e
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 23:19:05 2024 +0200

    god

commit 9eff107
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 23:11:08 2024 +0200

    Updates randomgen maint

commit 075dd0c
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 23:09:02 2024 +0200

    Update box maintenance

commit bbdb5d9
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 15:55:31 2024 +0200

    hmm

commit aef9e98
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 15:36:26 2024 +0200

    Grahh

commit 6074c34
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 15:06:57 2024 +0200

    Update

commit d7f81ed
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:54:30 2024 +0200

    A

commit 515f716
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:51:12 2024 +0200

    Goddd

commit de02dbb
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:47:30 2024 +0200

    Test

commit a279c81
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:43:00 2024 +0200

    Here

commit 6a00a31
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:35:36 2024 +0200

    Update

commit 09c3514
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:32:53 2024 +0200

    Update

commit e41ddf4
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:08:38 2024 +0200

    Ze update...

commit ae22bfa
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:32:15 2024 +0200

    Yeah

commit 6c6e872
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:26:05 2024 +0200

    Fix dis

commit fc68f9f
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:12:19 2024 +0200

    Fix this

commit 618ff37
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:06:46 2024 +0200

    Fix this

commit c1b4a90
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:03:36 2024 +0200

    Holy moly how didn't I notice this

commit 814eeeb
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 00:37:46 2024 +0200

    Update supermatter sprites

commit 5d256e6
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 23:12:00 2024 +0200

    Update update_tgs_dmapi.yml

commit 6795ed5
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 23:09:36 2024 +0200

    Remove this

commit 2bf8da8
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 23:06:02 2024 +0200

    I don't know what this is, I'm praying.

commit 27e2e80
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 22:46:28 2024 +0200

    Add: random-gen maintenance and other useful things

commit 1502cf9
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 21:14:42 2024 +0200

    Remove merge conflict

commit 31d7aa0
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 19:32:03 2024 +0200

    Fix character imports

commit e0b2d50
Merge: 7c6d677 dd7eba9
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 01:20:49 2024 +0200

    Merge remote-tracking branch 'splurt/master'

commit 7c6d677
Merge: e45b334 16ee47f
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 01:12:45 2024 +0200

    Merge pull request #5 from VENUS-Station/random

    Adds an examine to see simple mobs' health at a glance.

commit 16ee47f
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 01:10:40 2024 +0200

    Those two things!

commit 2e33b38
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 01:10:11 2024 +0200

    Fix xenoarch grass.

commit e45b334
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 22:42:18 2024 +0200

    Two new ruins

commit 7e0acc5
Merge: 2c17a32 9c6ef0c
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 21:37:16 2024 +0200

    Merge remote-tracking branch 'splurt/master'

commit 2c17a32
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 21:28:16 2024 +0200

    Add damage description to simple mobs, nerf imps a bit

commit c57d30a
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 18:12:50 2024 +0200

    Meowmeow...

commit 56cb046
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 15:59:42 2024 +0200

    Tweak this

commit c021ffe
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 14:55:24 2024 +0200

    Space parallax

commit ea2e59b
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 03:53:10 2024 +0200

    Freaky freaky

commit cc10cec
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 02:27:30 2024 +0200

    Lavaland parallax

commit 26fbf8a
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 01:24:54 2024 +0200

    Pool noodle suffix

commit b50a511
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 22:52:52 2024 +0200

    Fixes ebic thingie

commit cea98ff
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 22:08:13 2024 +0200

    Remove comma from world.dm alert

commit fef887e
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 19:11:52 2024 +0200

    Exclude songs in {} from random pick (for specialized picking)

commit eb8c1c3
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 18:47:47 2024 +0200

    World.dm players tweak

commit c971cfa
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 18:39:37 2024 +0200

    Linking specific titles + sounds, perhaps?

commit e750b4a
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 17:15:53 2024 +0200

    Tweak anomalies

commit c03a7bb
Merge: 564478a 435107c
Author: ariaworld <[email protected]>
Date:   Thu Sep 5 16:04:48 2024 +0200

    Merge pull request #4 from VENUS-Station/tgs-dmapi-update

    Automatic TGS DMAPI Update

commit 564478a
Author: ariaworld <[email protected]>
Date:   Thu Sep 5 16:03:16 2024 +0200

    Light overlay, pixel shift, disable notify

commit 435107c
Author: SPLURT-Station <[email protected]>
Date:   Thu Sep 5 01:40:43 2024 +0000

    Update TGS DMAPI

commit 665044f
Author: ariaworld <[email protected]>
Date:   Wed Sep 4 11:35:03 2024 +0200

    Fix pubby conflict marker + bot sprites

commit 09bce1b
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 22:44:23 2024 +0200

    Vote result

commit dd5b120
Merge: 1f38f22 0601002
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 22:26:34 2024 +0200

    Merge pull request #2 from VENUS-Station/new-additions

    Space update

commit 1f38f22
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 12:41:40 2024 +0200

    Purifies code, fix collapsible TGUI component

commit f7858c1
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 00:26:17 2024 +0200

    Revert "Update widget"

    This reverts commit 924d168.

commit 0601002
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 00:20:38 2024 +0200

    Space update

commit 7a33682
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 00:04:57 2024 +0200

    Max occurrences

commit 924d168
Author: ariaworld <[email protected]>
Date:   Sun Sep 1 23:29:53 2024 +0200

    Update widget

commit bc630be
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 14:48:10 2024 +0200

    Update: logo

commit 1d874d6
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 03:18:32 2024 +0200

    Tweak max occurrences

commit c3251fc
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 02:42:42 2024 +0200

    Update event occurrences

commit 618c28c
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 00:09:38 2024 +0200

    Fix paramedic locker sprite

commit bf4280f
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 00:03:44 2024 +0200

    Add missing plating to omega station

commit aea669b
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 00:02:16 2024 +0200

    Make sprinting hold by default

commit fabdf54
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 22:12:41 2024 +0200

    fix this too

commit eedb15e
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 22:05:39 2024 +0200

    disable those annoying vent clogs

commit b6b2a97
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 21:39:29 2024 +0200

    Fix cargo locker + shake animation

commit e6005d1
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 16:07:08 2024 +0200

    Update captain requirements

commit 6c8eeac
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 14:57:51 2024 +0200

    Update this too

commit d42c7a4
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 14:42:55 2024 +0200

    Merge remote-tracking branch

commit 76d9e42
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 14:41:25 2024 +0200

    Update this

commit d48f53a
Merge: 73d7346 4c5d165
Author: ariaworld <[email protected]>
Date:   Wed Aug 21 14:33:41 2024 +0200

    Merge branch 'main' of https://github.com/VENUS-Station/VENUS-Station-13

commit 73d7346
Author: ariaworld <[email protected]>
Date:   Wed Aug 21 14:33:33 2024 +0200

    Update l3closet.dm

commit 4c5d165
Merge: 2c9e118 5864e11
Author: ariaworld <[email protected]>
Date:   Tue Aug 20 19:25:37 2024 +0200

    Merge pull request #1 from VENUS-Station/tgs-dmapi-update

    Automatic TGS DMAPI Update

commit 5864e11
Author: SPLURT-Station <[email protected]>
Date:   Tue Aug 20 17:21:56 2024 +0000

    Update TGS DMAPI

commit 2c9e118
Author: ariaworld <[email protected]>
Date:   Tue Aug 20 16:47:59 2024 +0200

    Update update_tgs_dmapi.yml

commit d3b6358
Author: ariaworld <[email protected]>
Date:   Tue Aug 20 16:44:15 2024 +0200

    Update FUNDING.yml

commit 9bff08b
Author: ariaworld <[email protected]>
Date:   Mon Aug 19 00:34:26 2024 +0200

    Update shelleo

commit 1511087
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 23:43:15 2024 +0200

    Update playsound

commit ba1e93e
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 23:28:29 2024 +0200

    Parallax again!

commit 27bb11e
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 22:46:16 2024 +0200

    yt-dlp

commit 01088af
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 21:59:45 2024 +0200

    Parallax again

commit d0b3976
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 19:59:16 2024 +0200

    Always use new playerpanel.

commit 6eee0c7
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 19:55:08 2024 +0200

    parallax, fps

commit 8a53b00
Author: ariaworld <[email protected]>
Date:   Mon Aug 12 14:34:54 2024 +0200

    Better closets.

commit f1421f5
Author: ariaworld <[email protected]>
Date:   Wed Aug 7 00:45:50 2024 +0200

    Let's remove those unnecessary dots

commit bdd62f7
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 21:17:33 2024 +0200

    Change workflows: S.P.L.U.R.T -> V.E.N.U.S

commit 7e7e6be
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 21:07:16 2024 +0200

    Remove sad thing

commit 872a4c3
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 20:51:28 2024 +0200

    Update tgstation.dme

commit 29a9c5e
Merge: d2422de e6cee91
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 20:48:20 2024 +0200

    Merge remote-tracking branch 'splurt/master'

commit d2422de
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 20:46:52 2024 +0200

    Removes N.2 unholy ERP verbs. Add: new textures for doors and floors.

commit 309e31d
Author: ariaworld <[email protected]>
Date:   Fri Jun 7 23:12:30 2024 +0200

    Tweak: changed some sprites

commit 76775b6
Merge: 03f4064 8becd4e
Author: ariaworld <[email protected]>
Date:   Fri Jun 7 21:23:34 2024 +0200

    And so it begins.

commit 03f4064
Author: ariaworld <[email protected]>
Date:   Fri Jun 7 21:07:20 2024 +0200

    Initial commit
Kush1Push1 pushed a commit that referenced this pull request Oct 26, 2024
@SmiLeYre @ariaworld
@SaraSayomi @SPLURT-Station-Bot @actions-user @TiviPlus @MosleyTheMalO
Merge branch one (BlueMoon-Labs#1291)
0d1099d 
* Initial commit

* Tweak: changed some sprites

* Removes N.2 unholy ERP verbs. Add: new textures for doors and floors.

* Update tgstation.dme

* Remove sad thing

* Change workflows: S.P.L.U.R.T -> V.E.N.U.S

* Let's remove those unnecessary dots

* Better closets.

* parallax, fps

* Always use new playerpanel.

* Parallax again

* yt-dlp

* Parallax again!

* Update playsound

* Update shelleo

* Update FUNDING.yml

* Update update_tgs_dmapi.yml

* Update TGS DMAPI

* Update l3closet.dm

* Update this

* Merge remote-tracking branch

* Update this too

* Update captain requirements

* Fix cargo locker + shake animation

* disable those annoying vent clogs

* fix this too

* Make sprinting hold by default

* Add missing plating to omega station

* Fix paramedic locker sprite

* Update event occurrences

* Tweak max occurrences

* Update: logo

* Fixes

Revert lambda to upstream with my fixes
Remove airlock errors from meta whiteship
Fix meta pipenet errors
Remove merge conflict that is over 2 years old from upstream (because it's clearly not missed)

* All my homies hate upstream

LuizLeFish Ver.

* Psychology update

Adds psychology

* Update widget

* Shuttle_id fix

* Max occurrences

* Space update

* Revert "Update widget"

This reverts commit 924d168.

* No more pipenet errors or double turfs

99 pipenet errors on the wall, 99 pipenet errors on the wall, track one down, pass it around, 98 pipenet errors on the wall...

* Why were these even here

Removed golden katana and armor

* Purifies code, fix collapsible TGUI component

* Vote result

* Fix pubby conflict marker + bot sprites

* Update TGS DMAPI

* Light overlay, pixel shift, disable notify

* Tweak anomalies

* Linking specific titles + sounds, perhaps?

* World.dm players tweak

* Exclude songs in {} from random pick (for specialized picking)

* Med fixes

* Remove comma from world.dm alert

* Fixes ebic thingie

* Pool noodle suffix

* Lavaland parallax

* Freaky freaky

* Space parallax

* Tweak this

* Meowmeow...

* Add damage description to simple mobs, nerf imps a bit

* Two new ruins

* Fix xenoarch grass.

* Those two things!

* Fix character imports

* Remove merge conflict

* Add: random-gen maintenance and other useful things

* I don't know what this is, I'm praying.

* Remove this

* Update update_tgs_dmapi.yml

* Update supermatter sprites

* Holy moly how didn't I notice this

* Fix this

* Fix this

* Fix dis

* Yeah

* Ze update...

* Update

* Update

* Here

* Test

* Goddd

* A

* Update

* Grahh

* hmm

* Update box maintenance

* Updates randomgen maint

* god

* Automatic changelog generation for PR #6 [ci skip]

* Automatic changelog compile [ci skip]

* Fix this marginbottom

* Push push push

* Push

* Disable sentient disease

* Forcep ushing this.

* Deactivate revenant

* Fix: examine for mob damage

* Fix: tries to fix lobby + forced song

* Those messages shouldn't be important for admin chat.

* Remove merge conflict marker

* GOKU VS UNHOLY CODE.

* Let's get rid of this

* TGS doesn't need this

* Fuck

* Hope this will work

* Stops the linter from complaining because of this.

* He-hell naw!

* Reduce weight of electrical storm

* Meow,,

* Like why

* Removes lambda from upstream updates

* Comma

* More based delta

* +

* Merge remote-tracking branch

* A few more apartments

* Automatic changelog generation for PR #7 [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog generation for PR #8 [ci skip]

* Automatic changelog compile [ci skip]

* Fixpush

* Let's go GAMBLING!!

* Push push

* Initial that works

* BEE RD CONSOLE

* Add randomgen maint to pubby

* Fix winter

* Change this cyborg

* bring back the d20 of fate with wiznerd removed

* Check in announcement system

* Squashed commit of the following:

commit 87f439a
Author: ariaworld <[email protected]>
Date:   Wed Sep 18 00:58:37 2024 +0200

    Check in announcement system

commit fcfbd40
Author: ariaworld <[email protected]>
Date:   Wed Sep 18 00:48:20 2024 +0200

    bring back the d20 of fate with wiznerd removed

commit 3f3e267
Merge: ab2ff17 761c988
Author: ariaworld <[email protected]>
Date:   Tue Sep 17 23:54:14 2024 +0200

    Merge remote-tracking branch

commit ab2ff17
Author: ariaworld <[email protected]>
Date:   Tue Sep 17 23:45:44 2024 +0200

    Change this cyborg

commit 42481c6
Author: ariaworld <[email protected]>
Date:   Mon Sep 16 22:20:05 2024 +0200

    Fix winter

commit 9ee05b5
Author: ariaworld <[email protected]>
Date:   Mon Sep 16 16:12:05 2024 +0200

    Add randomgen maint to pubby

commit 66ecccc
Author: ariaworld <[email protected]>
Date:   Mon Sep 16 01:24:51 2024 +0200

    BEE RD CONSOLE

commit 7aef674
Author: ariaworld <[email protected]>
Date:   Mon Sep 16 00:45:27 2024 +0200

    Initial that works

commit 3c7237a
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 23:28:11 2024 +0200

    Push push

commit 6a6ffac
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 16:53:17 2024 +0200

    Let's go GAMBLING!!

commit 4a09f73
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 14:33:36 2024 +0200

    Fixpush

commit d0f9aaa
Author: Changelogs <[email protected]>
Date:   Sun Sep 15 01:49:54 2024 +0000

    Automatic changelog compile [ci skip]

commit b88d9a5
Author: VENUS Bot <[email protected]>
Date:   Sun Sep 15 01:49:14 2024 +0000

    Automatic changelog generation for PR #8 [ci skip]

commit 9c6ce6e
Merge: 74af6cc 1034322
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 03:48:39 2024 +0200

    Merge pull request #8 from VENUS-Station/apartments

    [PORT] Adds: a few more apartments to infinidorms.

commit 74af6cc
Author: Changelogs <[email protected]>
Date:   Sun Sep 15 01:34:40 2024 +0000

    Automatic changelog compile [ci skip]

commit efc76c9
Author: VENUS Bot <[email protected]>
Date:   Sun Sep 15 01:34:00 2024 +0000

    Automatic changelog generation for PR #7 [ci skip]

commit 7a12e87
Merge: b01e0f5 15dec30
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 03:33:29 2024 +0200

    Merge pull request #7 from VENUS-Station/praying

    Tries to add some safeguards to the RD console & designs.

commit 1034322
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 03:26:10 2024 +0200

    A few more apartments

commit b01e0f5
Merge: 568480f ada3d2e
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 02:04:42 2024 +0200

    Merge remote-tracking branch 'splurt/master'

commit 568480f
Author: ariaworld <[email protected]>
Date:   Sun Sep 15 02:04:30 2024 +0200

    Merge remote-tracking branch

commit 93b1db7
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 23:51:52 2024 +0200

    +

commit e8bdc01
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 21:57:51 2024 +0200

    More based delta

commit 9368e21
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 19:36:50 2024 +0200

    Like why

commit 67b519b
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 15:53:53 2024 +0200

    Meow,,

commit 051f369
Author: ariaworld <[email protected]>
Date:   Sat Sep 14 01:17:50 2024 +0200

    Reduce weight of electrical storm

commit 42a48e9
Author: ariaworld <[email protected]>
Date:   Fri Sep 13 23:12:01 2024 +0200

    He-hell naw!

commit eb89880
Author: ariaworld <[email protected]>
Date:   Fri Sep 13 03:21:11 2024 +0200

    Stops the linter from complaining because of this.

commit 15dec30
Author: ariaworld <[email protected]>
Date:   Fri Sep 13 03:11:22 2024 +0200

    Hope this will work

commit dd75dd1
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 23:54:19 2024 +0200

    Fuck

commit e0083a5
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 21:29:25 2024 +0200

    TGS doesn't need this

commit f01dc92
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 15:21:51 2024 +0200

    Let's get rid of this

commit 9c31d41
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 04:17:32 2024 +0200

    GOKU VS UNHOLY CODE.

commit 831992f
Author: ariaworld <[email protected]>
Date:   Thu Sep 12 00:01:41 2024 +0200

    Remove merge conflict marker

commit a4e67cc
Author: Tivi <[email protected]>
Date:   Wed Sep 8 00:58:25 2021 +0200

    Those messages shouldn't be important for admin chat.

commit 5176ca4
Author: ariaworld <[email protected]>
Date:   Wed Sep 11 13:56:16 2024 +0200

    Fix: tries to fix lobby + forced song

commit 95b3800
Author: ariaworld <[email protected]>
Date:   Wed Sep 11 03:01:24 2024 +0200

    Fix: examine for mob damage

commit d936844
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 23:59:50 2024 +0200

    Deactivate revenant

commit 75aeea9
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 23:45:06 2024 +0200

    Forcep ushing this.

commit 073a585
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 23:02:18 2024 +0200

    Disable sentient disease

commit 547dbbe
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 22:41:26 2024 +0200

    Push

commit 973c9b4
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 22:31:50 2024 +0200

    Push push push

commit eb652ad
Author: ariaworld <[email protected]>
Date:   Tue Sep 10 01:39:58 2024 +0200

    Fix this marginbottom

commit d2b2cb1
Author: Changelogs <[email protected]>
Date:   Mon Sep 9 21:37:04 2024 +0000

    Automatic changelog compile [ci skip]

commit 889c9ce
Author: VENUS Bot <[email protected]>
Date:   Mon Sep 9 21:36:23 2024 +0000

    Automatic changelog generation for PR #6 [ci skip]

commit d9579ac
Merge: aef9e98 e4f528e
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 23:35:47 2024 +0200

    Merge pull request #6 from VENUS-Station/randomgen-maint

    Adds 193 random-gen Maintenance Ruins to Box Station

commit e4f528e
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 23:19:05 2024 +0200

    god

commit 9eff107
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 23:11:08 2024 +0200

    Updates randomgen maint

commit 075dd0c
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 23:09:02 2024 +0200

    Update box maintenance

commit bbdb5d9
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 15:55:31 2024 +0200

    hmm

commit aef9e98
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 15:36:26 2024 +0200

    Grahh

commit 6074c34
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 15:06:57 2024 +0200

    Update

commit d7f81ed
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:54:30 2024 +0200

    A

commit 515f716
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:51:12 2024 +0200

    Goddd

commit de02dbb
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:47:30 2024 +0200

    Test

commit a279c81
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:43:00 2024 +0200

    Here

commit 6a00a31
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:35:36 2024 +0200

    Update

commit 09c3514
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:32:53 2024 +0200

    Update

commit e41ddf4
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 14:08:38 2024 +0200

    Ze update...

commit ae22bfa
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:32:15 2024 +0200

    Yeah

commit 6c6e872
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:26:05 2024 +0200

    Fix dis

commit fc68f9f
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:12:19 2024 +0200

    Fix this

commit 618ff37
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:06:46 2024 +0200

    Fix this

commit c1b4a90
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 02:03:36 2024 +0200

    Holy moly how didn't I notice this

commit 814eeeb
Author: ariaworld <[email protected]>
Date:   Mon Sep 9 00:37:46 2024 +0200

    Update supermatter sprites

commit 5d256e6
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 23:12:00 2024 +0200

    Update update_tgs_dmapi.yml

commit 6795ed5
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 23:09:36 2024 +0200

    Remove this

commit 2bf8da8
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 23:06:02 2024 +0200

    I don't know what this is, I'm praying.

commit 27e2e80
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 22:46:28 2024 +0200

    Add: random-gen maintenance and other useful things

commit 1502cf9
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 21:14:42 2024 +0200

    Remove merge conflict

commit 31d7aa0
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 19:32:03 2024 +0200

    Fix character imports

commit e0b2d50
Merge: 7c6d677 dd7eba9
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 01:20:49 2024 +0200

    Merge remote-tracking branch 'splurt/master'

commit 7c6d677
Merge: e45b334 16ee47f
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 01:12:45 2024 +0200

    Merge pull request #5 from VENUS-Station/random

    Adds an examine to see simple mobs' health at a glance.

commit 16ee47f
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 01:10:40 2024 +0200

    Those two things!

commit 2e33b38
Author: ariaworld <[email protected]>
Date:   Sun Sep 8 01:10:11 2024 +0200

    Fix xenoarch grass.

commit e45b334
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 22:42:18 2024 +0200

    Two new ruins

commit 7e0acc5
Merge: 2c17a32 9c6ef0c
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 21:37:16 2024 +0200

    Merge remote-tracking branch 'splurt/master'

commit 2c17a32
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 21:28:16 2024 +0200

    Add damage description to simple mobs, nerf imps a bit

commit c57d30a
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 18:12:50 2024 +0200

    Meowmeow...

commit 56cb046
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 15:59:42 2024 +0200

    Tweak this

commit c021ffe
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 14:55:24 2024 +0200

    Space parallax

commit ea2e59b
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 03:53:10 2024 +0200

    Freaky freaky

commit cc10cec
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 02:27:30 2024 +0200

    Lavaland parallax

commit 26fbf8a
Author: ariaworld <[email protected]>
Date:   Sat Sep 7 01:24:54 2024 +0200

    Pool noodle suffix

commit b50a511
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 22:52:52 2024 +0200

    Fixes ebic thingie

commit cea98ff
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 22:08:13 2024 +0200

    Remove comma from world.dm alert

commit fef887e
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 19:11:52 2024 +0200

    Exclude songs in {} from random pick (for specialized picking)

commit eb8c1c3
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 18:47:47 2024 +0200

    World.dm players tweak

commit c971cfa
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 18:39:37 2024 +0200

    Linking specific titles + sounds, perhaps?

commit e750b4a
Author: ariaworld <[email protected]>
Date:   Fri Sep 6 17:15:53 2024 +0200

    Tweak anomalies

commit c03a7bb
Merge: 564478a 435107c
Author: ariaworld <[email protected]>
Date:   Thu Sep 5 16:04:48 2024 +0200

    Merge pull request #4 from VENUS-Station/tgs-dmapi-update

    Automatic TGS DMAPI Update

commit 564478a
Author: ariaworld <[email protected]>
Date:   Thu Sep 5 16:03:16 2024 +0200

    Light overlay, pixel shift, disable notify

commit 435107c
Author: SPLURT-Station <[email protected]>
Date:   Thu Sep 5 01:40:43 2024 +0000

    Update TGS DMAPI

commit 665044f
Author: ariaworld <[email protected]>
Date:   Wed Sep 4 11:35:03 2024 +0200

    Fix pubby conflict marker + bot sprites

commit 09bce1b
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 22:44:23 2024 +0200

    Vote result

commit dd5b120
Merge: 1f38f22 0601002
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 22:26:34 2024 +0200

    Merge pull request #2 from VENUS-Station/new-additions

    Space update

commit 1f38f22
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 12:41:40 2024 +0200

    Purifies code, fix collapsible TGUI component

commit f7858c1
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 00:26:17 2024 +0200

    Revert "Update widget"

    This reverts commit 924d168.

commit 0601002
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 00:20:38 2024 +0200

    Space update

commit 7a33682
Author: ariaworld <[email protected]>
Date:   Mon Sep 2 00:04:57 2024 +0200

    Max occurrences

commit 924d168
Author: ariaworld <[email protected]>
Date:   Sun Sep 1 23:29:53 2024 +0200

    Update widget

commit bc630be
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 14:48:10 2024 +0200

    Update: logo

commit 1d874d6
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 03:18:32 2024 +0200

    Tweak max occurrences

commit c3251fc
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 02:42:42 2024 +0200

    Update event occurrences

commit 618c28c
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 00:09:38 2024 +0200

    Fix paramedic locker sprite

commit bf4280f
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 00:03:44 2024 +0200

    Add missing plating to omega station

commit aea669b
Author: ariaworld <[email protected]>
Date:   Sat Aug 31 00:02:16 2024 +0200

    Make sprinting hold by default

commit fabdf54
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 22:12:41 2024 +0200

    fix this too

commit eedb15e
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 22:05:39 2024 +0200

    disable those annoying vent clogs

commit b6b2a97
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 21:39:29 2024 +0200

    Fix cargo locker + shake animation

commit e6005d1
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 16:07:08 2024 +0200

    Update captain requirements

commit 6c8eeac
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 14:57:51 2024 +0200

    Update this too

commit d42c7a4
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 14:42:55 2024 +0200

    Merge remote-tracking branch

commit 76d9e42
Author: ariaworld <[email protected]>
Date:   Thu Aug 29 14:41:25 2024 +0200

    Update this

commit d48f53a
Merge: 73d7346 4c5d165
Author: ariaworld <[email protected]>
Date:   Wed Aug 21 14:33:41 2024 +0200

    Merge branch 'main' of https://github.com/VENUS-Station/VENUS-Station-13

commit 73d7346
Author: ariaworld <[email protected]>
Date:   Wed Aug 21 14:33:33 2024 +0200

    Update l3closet.dm

commit 4c5d165
Merge: 2c9e118 5864e11
Author: ariaworld <[email protected]>
Date:   Tue Aug 20 19:25:37 2024 +0200

    Merge pull request #1 from VENUS-Station/tgs-dmapi-update

    Automatic TGS DMAPI Update

commit 5864e11
Author: SPLURT-Station <[email protected]>
Date:   Tue Aug 20 17:21:56 2024 +0000

    Update TGS DMAPI

commit 2c9e118
Author: ariaworld <[email protected]>
Date:   Tue Aug 20 16:47:59 2024 +0200

    Update update_tgs_dmapi.yml

commit d3b6358
Author: ariaworld <[email protected]>
Date:   Tue Aug 20 16:44:15 2024 +0200

    Update FUNDING.yml

commit 9bff08b
Author: ariaworld <[email protected]>
Date:   Mon Aug 19 00:34:26 2024 +0200

    Update shelleo

commit 1511087
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 23:43:15 2024 +0200

    Update playsound

commit ba1e93e
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 23:28:29 2024 +0200

    Parallax again!

commit 27bb11e
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 22:46:16 2024 +0200

    yt-dlp

commit 01088af
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 21:59:45 2024 +0200

    Parallax again

commit d0b3976
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 19:59:16 2024 +0200

    Always use new playerpanel.

commit 6eee0c7
Author: ariaworld <[email protected]>
Date:   Sun Aug 18 19:55:08 2024 +0200

    parallax, fps

commit 8a53b00
Author: ariaworld <[email protected]>
Date:   Mon Aug 12 14:34:54 2024 +0200

    Better closets.

commit f1421f5
Author: ariaworld <[email protected]>
Date:   Wed Aug 7 00:45:50 2024 +0200

    Let's remove those unnecessary dots

commit bdd62f7
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 21:17:33 2024 +0200

    Change workflows: S.P.L.U.R.T -> V.E.N.U.S

commit 7e7e6be
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 21:07:16 2024 +0200

    Remove sad thing

commit 872a4c3
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 20:51:28 2024 +0200

    Update tgstation.dme

commit 29a9c5e
Merge: d2422de e6cee91
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 20:48:20 2024 +0200

    Merge remote-tracking branch 'splurt/master'

commit d2422de
Author: ariaworld <[email protected]>
Date:   Mon Aug 5 20:46:52 2024 +0200

    Removes N.2 unholy ERP verbs. Add: new textures for doors and floors.

commit 309e31d
Author: ariaworld <[email protected]>
Date:   Fri Jun 7 23:12:30 2024 +0200

    Tweak: changed some sprites

commit 76775b6
Merge: 03f4064 8becd4e
Author: ariaworld <[email protected]>
Date:   Fri Jun 7 21:23:34 2024 +0200

    And so it begins.

commit 03f4064
Author: ariaworld <[email protected]>
Date:   Fri Jun 7 21:07:20 2024 +0200

    Initial commit

* Revert "Change workflows: S.P.L.U.R.T -> V.E.N.U.S"

This reverts commit bdd62f7.

* Update README.md

* Revert "Update FUNDING.yml"

This reverts commit d3b6358.

* Revert "He-hell naw!"

This reverts commit 42a48e9.

* restores SPLURT

Abz!

* Revert "Let's get rid of this"

This reverts commit f01dc92.

* Some useful things (I hope title.dm will work, praying)

* Update negative.dm

* Hilbert hotel vending machine prices + modular venus templates

* Fuck

* area_limited jukeboxes

* Shuttle fix compatible

* Refix

* Some fixes (parallax and closets)

* undoes removals

* Revert "Purifies code, fix collapsible TGUI component"

This reverts commit 1f38f22.

* Update world.dm

* Revert "Disable sentient disease"

This reverts commit 073a585.

* Revert "Deactivate revenant"

This reverts commit d936844.

* Revert "Update event occurrences"

This reverts commit c3251fc.

* modularize

* Revert "Make sprinting hold by default"

This reverts commit aea669b.

* lol

* Revert "Update this"

This reverts commit 76d9e42.

* Revert "GOKU VS UNHOLY CODE."

This reverts commit 9c31d41.

* Revert "Update this too"

This reverts commit 6c8eeac.

* Update ash_walker_den.dm

* Revert "Update: logo"

This reverts commit bc630be.

* how about another joke murray?

* Update rdconsole.dm

* Automatic changelog generation for PR BlueMoon-Labs#1196 [ci skip]

* Automatic changelog compile [ci skip]

* PORT: Beestation Legion code

* New plant sprites

* Revert "Vote result"

This reverts commit 09bce1b.

* Update markings.dm

* Fix changelog

* Fix hivelord

* Update lambda.dmm

* Will this work?

* Surgery time seconds

* Move turbine computer

* ^ they couldn't add the correct extension to a file

* Revert "Tweak anomalies"

This reverts commit e750b4a.

* Revert "Max occurrences"

This reverts commit 7a33682.

* Revert "Reduce weight of electrical storm"

This reverts commit 051f369.

* Revert "Tweak max occurrences"

This reverts commit 1d874d6.

* Revert "Those two things!"

This reverts commit 16ee47f.

* Revert "disable those annoying vent clogs"

This reverts commit eedb15e.

* Update 2024-09.yml

solely because it was crashing the changelog

* vending stuff

* Update apartments

* Update readme

* Lair 4.dmm

* Automatic changelog generation for PR BlueMoon-Labs#1201 [ci skip]

* Automatic changelog compile [ci skip]

* Merge branch 'content-stuff'

* merge_branch_one

* default_raw_text

* default_raw_text

* /obj/machinery/computer/library/checkout

* Уэ.

* +

* Заменил файлики шкафов, удалил модельки наших АПЦ.

* Лишнее в ТГС.ДМЕ.

* Поправил 3x5 и 5x3 карты.

* Я сделаль.

---------

Co-authored-by: ariaworld <[email protected]>
Co-authored-by: SPLURT-Station <[email protected]>
Co-authored-by: xhianil <[email protected]>
Co-authored-by: Sara <[email protected]>
Co-authored-by: VENUS Bot <[email protected]>
Co-authored-by: Changelogs <[email protected]>
Co-authored-by: Tivi <[email protected]>
Co-authored-by: Sara <[email protected]>
Co-authored-by: Mosley <[email protected]>
Co-authored-by: SPLURT Bot <[email protected]>
Kush1Push1 pushed a commit that referenced this pull request Oct 31, 2024
@JWosak
Merge pull request #4 from JWosak/CogStation-Remake
58dbc22 
CogStation Remake
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.