cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,332 Commits 5 Branches 0 Tags
43b9196ff6eea6c9f0a580cc8f10f19a0d17f49c
Commit Graph

57332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rykka
831274aad7 Critical Bugfix to Aurora Cooking not working with Reagents 
Any recipes that had reagents involved in them would fail, because of a SINGLE MISPLACED ).

I spent two hours looking for this, I feel dumb as shit, but this should fix the recipe issues on live.
 2020-08-03 16:45:44 -04:00
Unknown
3fe46bbf8d Unlimited Credit Sharing Range 
It is bad for someone to miss out on points because they were 16 tiles away instead of 14.
 2020-08-03 14:49:24 -04:00
Novacat
00440e5683 Merge pull request #8579 from Rykka-Stormheart/shep-dev-arcade-sounds-hotfix 
Critical Arcade Audio fix pls speedmerge
 2020-08-03 14:23:45 -04:00
Rykka
4018d73b3d Critical Arcade Earrape fix pls speedmerge 
This prevents arcades from literally deafening you from 10+ tiles away.

They will now only play on your tile and the tile next to you.
 2020-08-03 13:57:17 -04:00
Izac Joof Forsgren
f02c824302 Merge pull request #924 from KillianKirilenko/kk-mapfixes 
Mapping Updates
 2020-08-03 16:06:11 +02:00
Killian
7f25879149 mapping updates 2020-08-03 09:06:52 +01:00
Izac Joof Forsgren
7c335dfddf Merge pull request #922 from Yawn-Wider/izac 
Voreupdate
 2020-08-03 00:25:05 +02:00
Izac Joof Forsgren
3eb44f5ea7 Merge branch 'master' into izac 2020-08-03 00:11:42 +02:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Izac Joof Forsgren
4ca284049d Merge pull request #921 from KBraid/Kbraidtweaks 
tesh markings fix
 2020-08-02 23:46:46 +02:00
Izac Joof Forsgren
0a7d65bdae Merge branch 'master' into Kbraidtweaks 2020-08-02 23:32:22 +02:00
Braiden
1d96e6506b tesh markings fix 
moved a pixel down
 2020-08-02 16:01:37 -05:00
lbnesquik
fbacbad91d Tweaks to taur clothes, particularly saddles as well as tail tags. 
- Remove capitalisation from back_vr.dmi
- Add a tag to most tails. This can be used for many things, but mostly to have an simpler check of the tail type. See backpack_vr.dm.
- Switch the backpack sprite selection to a switch()
 2020-08-02 22:22:27 +02:00
Novacat
ad38856620 Merge pull request #8576 from VOREStation/master 
August 2 2020 Release
 2020-08-02 16:14:15 -04:00
Novacat
54620b3a2c Merge pull request #8575 from Verkister/chonkers 
Adds otieborgs and other fixes/tweaks
 2020-08-02 11:38:06 -04:00
Verkister
67c2675316 Adds otieborgs and other fixes/tweaks 
-Adds new model option for k9 and janihound.
-Remakes k69 sprites and adds full rest poses for them.
-Adds full rest poses for k92.
-Adds placeholder rest poses for borgi models to prevent hitting the blank icon.
-Adds a borg belly var to enable the alive/dead indicator light on bellysprite. Enabled for medical sleeperbelly, disabled for others.
-Trims out the clutter caused by every bellysprite having required 2 versions until now.
 2020-08-02 16:34:06 +03:00
Verkister
111d70187a Merge pull request #8517 from Rykka-Stormheart/shep-dev-audio-port 
Ambiance and Sound Updates Attempt 3
 2020-08-02 14:14:53 +03:00
Rykka
27651cbc80 Re-attempt commit 2020-08-02 07:03:34 -04:00
Izac Joof Forsgren
0b6171b307 Merge pull request #920 from Yawn-Wider/dependabot/npm_and_yarn/tgui/elliptic-6.5.3 
Bump elliptic from 6.5.2 to 6.5.3 in /tgui
 2020-08-02 08:19:18 +02:00
Novacat
dc352344fa Merge pull request #8565 from VOREStation/upstream-merge-7383 
[MIRROR] Adds Area-Based Meson Obfuscation
 2020-08-02 02:13:21 -04:00
Novacat
b67d52dce5 Merge pull request #8573 from VOREStation/upstream-merge-7404 
[MIRROR] Fuel spills no longer persistent
 2020-08-02 02:08:59 -04:00
Novacat
0bd35487c9 Merge pull request #8572 from VOREStation/upstream-merge-7401 
[MIRROR] Fixes null grab runtime breaking mob movement
 2020-08-02 02:08:44 -04:00
Novacat
76db6ce742 Merge pull request #8570 from VOREStation/upstream-merge-7396 
[MIRROR] Swaps codersprites of status icons, meant to be done before merge.
 2020-08-02 02:08:08 -04:00
Novacat
24de423526 Merge pull request #8569 from VOREStation/upstream-merge-7392 
[MIRROR] Add a 'Restarting world!' notice.
 2020-08-02 02:07:40 -04:00
Novacat
72f11ea107 Merge pull request #8568 from VOREStation/upstream-merge-7389 
[MIRROR] Ports Baystation virology machinery sprites
 2020-08-02 02:06:45 -04:00
Novacat
b978e90ff5 Merge pull request #8567 from VOREStation/upstream-merge-7388 
[MIRROR] Ports library machine sprites from Aurora
 2020-08-02 02:06:22 -04:00
Novacat
d14549b362 Merge pull request #8566 from VOREStation/upstream-merge-7387 
[MIRROR] Teshari sneeze fix
 2020-08-02 02:06:04 -04:00
Novacat
0d1ae2638f Update human.dm 2020-08-02 02:01:34 -04:00
Novacat
d604d16be5 Merge pull request #8564 from VOREStation/upstream-merge-7381 
[MIRROR] Adds a preference dropdown for window scaling
 2020-08-02 01:58:36 -04:00
Novacat
92666aa7d3 Merge pull request #8563 from VOREStation/upstream-merge-7366 
[MIRROR] Ambiance and Sound Updates
 2020-08-02 01:58:19 -04:00
Novacat
dced0f14c7 Merge pull request #8574 from VOREStation/dependabot/npm_and_yarn/tgui/elliptic-6.5.3 
Bump elliptic from 6.5.2 to 6.5.3 in /tgui
 2020-08-02 01:57:51 -04:00
dependabot[bot]
55652aa147 Bump elliptic from 6.5.2 to 6.5.3 in /tgui 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-02 05:56:47 +00:00
Novacat
86991fb05c Merge pull request #8562 from VOREStation/upstream-merge-7365 
[MIRROR] Fish tank
 2020-08-02 01:56:42 -04:00
dependabot[bot]
d335f60a87 Bump elliptic from 6.5.2 to 6.5.3 in /tgui 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-02 05:45:18 +00:00
VirgoBot
0a8f70a674 Fuel spills no longer persistent 2020-08-02 00:23:52 -04:00
Atermonera
2e93636b24 Merge pull request #7404 from Cerebulon/fuelbgone 
Fuel spills no longer persistent
 2020-08-02 00:23:52 -04:00
VirgoBot
13af78a7ff Fixes null grab runtime breaking mob movement 2020-08-02 00:21:35 -04:00
Atermonera
93e0f90479 Merge pull request #7401 from Verkister/patch-44 
Fixes null grab runtime breaking mob movement
 2020-08-02 00:21:35 -04:00
VirgoBot
3d83fab1b6 Swaps codersprites of status icons, meant to be done before merge. 2020-08-02 00:16:58 -04:00
Atermonera
a5d7b2da47 Merge pull request #7396 from Mechoid/UnCoderspriteStatus 
Swaps codersprites of status icons, meant to be done before merge.
 2020-08-02 00:16:58 -04:00
VirgoBot
76270f4596 Add a 'Restarting world!' notice. 2020-08-02 00:15:43 -04:00
Atermonera
9336c4690d Merge pull request #7392 from lbnesquik/Kot-Restart-Sentnece 
Add a 'Restarting world!' notice.
 2020-08-02 00:15:43 -04:00
VirgoBot
25f1ef54d4 Ports Baystation virology machinery sprites 2020-08-02 00:10:19 -04:00
Atermonera
a31dfa24f5 Merge pull request #7389 from listerla/virology 
Ports Baystation virology machinery sprites
 2020-08-02 00:10:18 -04:00
VirgoBot
34414ccf3c Ports library machine sprites from Aurora 2020-08-02 00:09:03 -04:00
Atermonera
00a747eec0 Merge pull request #7388 from listerla/libmachines 
Ports library machine sprites from Aurora
 2020-08-02 00:09:03 -04:00
VirgoBot
035ea78f57 Teshari sneeze fix 2020-08-02 00:06:45 -04:00
Atermonera
e144bd2628 Merge pull request #7387 from listerla/teshsneeze 
Teshari sneeze fix
 2020-08-02 00:06:45 -04:00
Atermonera
c889e5ebe2 Adds Area-Based Meson Obfuscation 2020-08-02 00:05:29 -04:00
VirgoBot
7f181742fa Adds a preference dropdown for window scaling 2020-08-01 23:59:02 -04:00