cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,472 Commits 8 Branches 0 Tags
c8a25ea411fa8d8ccbe20f1cfd6918678ef3e64d
Commit Graph

27158 Commits

Author SHA1 Message Date
CHOMPStation2
c8a25ea411 Update recipe.dm 2020-08-09 14:27:11 -07:00
Razgriz
a5d046f53a Remove resleeving sickness data 2020-08-09 13:53:02 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Repede
74ee6f30f2 new white gearharness and redid yw xion sprites, added new gear harness to loadout for public use 2020-08-07 19:25:27 -04:00
izac112
21788f3cab Reaads supply demand 2020-08-07 01:37:47 +02:00
izac112
43b9196ff6 Disables aurora caelus 2020-08-07 01:17:27 +02:00
Braiden
63963d569c tesh hold sprite undo 
change did not have the intended effect, dissabling the change for now until a better solution can be found.
 2020-08-06 14:21:22 -05:00
Repede
12407af180 fnjfgdsg 2020-08-06 00:44:19 -04:00
Rykka
0214f52039 Aurora Cooking Pre-heating bugfix 
Appliances previously had 60k resist and 30k resist, for fryer and oven respectively.

This meant that fryer would heat up in 62 minutes and oven would heat in 35-45. Obviously completely out of wack.

Now grill heats in at 6:50, fryer at 10:35, and oven at 12:10 to reach peak/cap temperatures!
 2020-08-06 00:23:35 -04:00
Repede
a6bf2cc52b force defining proper TGS3 shit 2020-08-05 19:07:03 -04:00
izac112
c85bf8104c Voreupdate (Small) 2020-08-05 17:45:22 +02:00
Razgriz
f1e2ff6cd1 Merge pull request #438 from LunarFleet/Lun-Demons 
Kassc's demon changes
 2020-08-04 18:15:29 -07:00
Izac Joof Forsgren
4722dc8a9f Merge branch 'master' into Kbraidtweaks 2020-08-05 00:58:37 +02:00
Izac Joof Forsgren
dcd4a1807d Update code/modules/mob/holder.dm 2020-08-05 00:58:27 +02:00
Braiden
fc1d69bcff Merge branch 'Kbraidtweaks' of https://github.com/KBraid/YWPolarisVore into Kbraidtweaks 2020-08-04 17:50:03 -05:00
Braiden
492a14f036 Remove luminosity from held teshari sprite 
brightened up the held tesh sprite to dampen overbrightness of colours in game.
 2020-08-04 17:50:00 -05:00
Novacat
b3b7e4d778 Merge pull request #8577 from lbnesquik/Kot-saddle-tweak 
Tweaks to taur clothes, particularly saddles as well as taur tail tags
 2020-08-04 18:40:31 -04:00
Novacat
8ea243def0 Merge pull request #8583 from Novacat/nova-pathfinder 
Nerfs harm/disarm steppies
 2020-08-04 16:37:05 -04:00
Rykka
62e9c9c609 Earlyports Hair Gradients + Fixes for them! 
Earlyports: https://github.com/VOREStation/VOREStation/pull/8445 and https://github.com/VOREStation/VOREStation/pull/8353 and https://github.com/VOREStation/VOREStation/pull/8360

Example image:
![](https://user-images.githubusercontent.com/31356648/86080653-6b1edc00-ba61-11ea-9225-ddd021ff3bcc.png)
 2020-08-04 16:35:01 -04:00
Rykka
5344b97069 Skip calling handle_ambience() if there is no client assigned 
Fixes potential CPU usage issue for EVERY single mob having that call
 2020-08-04 16:11:17 -04:00
Izac Joof Forsgren
8231373a4b Merge branch 'master' into kk-mapfixes 2020-08-04 18:06:15 +02:00
Killian
47cd96b3bb miscellaneous updates 2020-08-04 11:23:19 +01:00
ShadowLarkens
d0c9b7ccd1 Fixed TGUI Not refocusing mapwindow 2020-08-03 20:50:02 -07:00
Unknown
22c9294aa3 Phase 1 tweaks 2020-08-03 19:10:10 -04:00
Unknown
1f382c6cd7 Nerfs harm/disarm steppies 
- Reduces damage multiplier on harm steppies from 3.5 to 2.5
- Removes forcerest and halloss from disarm steppies. Replaces with weaken proc.
 2020-08-03 18:38:51 -04:00
izac112
9044c9da02 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-04 00:15:48 +02:00
Novacat
ad60bf1299 Merge pull request #8580 from Novacat/nova-pathfinder 
Unlimited Credit Sharing Range
 2020-08-03 17:07:12 -04:00
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
Killian
7f25879149 mapping updates 2020-08-03 09:06:52 +01:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02: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
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
Rykka
27651cbc80 Re-attempt commit 2020-08-02 07:03:34 -04: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
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
0d1ae2638f Update human.dm 2020-08-02 02:01:34 -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
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
Atermonera
c889e5ebe2 Adds Area-Based Meson Obfuscation 2020-08-02 00:05:29 -04:00
Atermonera
3f3bf073e0 Merge pull request #7366 from Rykka-Stormheart/shep-dev-soundstuff 
Ambiance and Sound Updates
 2020-08-01 23:47:22 -04:00
Mechoid
78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
izac112
8b15e576d7 Updates plant-b-gone recipe 2020-08-01 18:59:19 +02:00
Kates
6437f7aee4 Attempt to fix mech and fighter movement issues within space. (#7376) 
* Attempt to fix mech and fighter movement issues within space.

Here is the issue in question: https://github.com/VOREStation/VOREStation/issues/8438

* Update Mecha.dm to fix #7376 request
 2020-08-01 01:15:51 -04:00
Novacat
c3e3da72f5 Merge pull request #8550 from VOREStation/upstream-merge-7377 
[MIRROR] Species Vars Extension Pt3: Blood!
 2020-07-31 17:19:01 -04:00
Novacat
1921b21a1a Merge pull request #8549 from VOREStation/upstream-merge-7385 
[MIRROR] Clothes, clothes, clothes!
 2020-07-31 16:58:54 -04:00
Novacat
188eaf06a2 Update clothing.dm 2020-07-31 16:47:53 -04:00
Novacat
8e79488e0c Update loadout_head.dm 2020-07-31 16:47:36 -04:00
Rykka
ae37c4e003 Update Trait Description 2020-07-31 08:07:25 -04:00
Rykka
befcc8c9ea Fixes Cold/Heat-adapted Traits, Prevents heat death in RIGsuit 
Lowers body_temperature to 290k (16.85C) for Cold-Adapted, and raises it to 330k (56.85C) for Hot-Adapted
 2020-07-31 07:49:36 -04:00