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

17619 Commits

Author SHA1 Message Date
Repede
1e4e534b9e Chainsaws - replaced New with Initialize so chainsaws can be mapped in 2020-08-05 20:15:04 -04:00
izac112
c85bf8104c Voreupdate (Small) 2020-08-05 17:45:22 +02: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
Izac Joof Forsgren
8231373a4b Merge branch 'master' into kk-mapfixes 2020-08-04 18:06:15 +02:00
Killian
7db5a3a9de Update science_vr.dm 2020-08-04 11:41:14 +01:00
Killian
e52e932eea Update closets_yw.dm 2020-08-04 11:29:31 +01:00
Killian
47cd96b3bb miscellaneous updates 2020-08-04 11:23:19 +01:00
izac112
9044c9da02 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-04 00:15:48 +02: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
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
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
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
92666aa7d3 Merge pull request #8563 from VOREStation/upstream-merge-7366 
[MIRROR] Ambiance and Sound Updates
 2020-08-02 01:58:19 -04:00
Atermonera
2e93636b24 Merge pull request #7404 from Cerebulon/fuelbgone 
Fuel spills no longer persistent
 2020-08-02 00:23:52 -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
Cyantime
2b82bb0fdb Fixes egg icons, probably 2020-08-01 02:03:02 -04:00
Novacat
99e03842a5 Merge pull request #8557 from VOREStation/upstream-merge-7376 
[MIRROR] Attempt to fix mech and fighter movement issues within space.
 2020-08-01 01:29:15 -04: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
Cyantime
c70900f3f1 Fixes ambiguity of pizza portal location 2020-07-31 23:11:38 -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
2ccb99611e Update medical_stand_vr.dm 2020-07-31 17:01:26 -04:00
Unknown
54d0193353 Fixes Stand 2020-07-31 16:54:33 -04:00
Heroman
00917e8e8b Adds a very familiar plushie 2020-07-31 19:07:45 +10:00
Killian
84128e72ff blood mechanics tweaks (#7377) 2020-07-31 04:54:11 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
Novacat
daa3307d25 Merge pull request #8534 from VOREStation/upstream-merge-7350 
[MIRROR] Relatively small changes to how damage affects mechs.
 2020-07-30 15:05:34 -04:00
Novacat
d68f0ece6a Update mecha.dm 2020-07-30 14:52:28 -04:00
Atermonera
142f0c253f Relatively small changes to how damage affects mechs. 2020-07-30 14:45:01 -04:00
Rykka
5e0b45cfe1 Freezers are chilly! 
Freezers will start at T0C - 5 (Which is effectively 268.15), and a new Freezer air alarm subtype has been added that bypasses the TLV hardcoded default to allow for larger cooling thresholds (and allow lower target temps).

TL;DR: Freezer tiles and the kitchen freezer will start cold and actually stay cold, prompting "you feel chilly" in the freezer. Other areas that use /freezer/ tiles may be affected by the initial temp, but this should quickly resolve itself thanks to heat balancing.
 2020-07-30 13:01:08 -04:00
ShadowLarkens
da74167d27 Fix a few things about the body scanner 2020-07-29 20:29:24 -07:00
Unknown
f4398a4f89 Reverts vorestation edit to large crate 
Fixes invisible crates.
 2020-07-29 20:32:44 -04:00
Repede
f34bcb03e6 Merge branch 'master' into kk-mapfixes 2020-07-29 19:39:11 -04:00
izac112
c6075d1216 Voreupdate (small) 2020-07-30 00:17:26 +02:00
Rykka
ca3aa318b0 Fix Adv Med Printout 2020-07-29 06:22:09 -04:00
Novacat
7d9305da76 Merge pull request #8508 from ShadowLarkens/patch-1 
Revert unintentional nerf to sleepers
 2020-07-28 05:03:29 -04:00
ShadowLarkens
4f2bb7bc34 Fix ghosts being unable to interact with TGUI by default 2020-07-28 01:16:00 -07:00
ShadowLarkens
fe597f18dc Revert unintentional nerf to sleepers 
Whoops. Swore I read a -25 health limitation to injecting people before TGUI, but that wasn't the case. This fixes a bug introduced by #8471
 2020-07-28 00:01:41 -07:00
Killian
33628a559e Merge branch 'master' into kk-mapfixes 2020-07-28 02:26:26 +01:00
SplinterGP
9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00
Killian
0ce7630ad2 TEST map tweaks 2020-07-27 23:30:36 +01:00
Rykka
0800f05c31 Fix for Camera interaction for Borgs/Drones. 
To note - the original change was intentional change on Paradise/Polaris's part.

"You might not have been able to actually view the cameras, but you should have been able to open the interface."
 2020-07-27 05:28:17 -04:00
izac112
38288b15c6 Voreupdate (small) 2020-07-27 06:34:28 +02:00
ShadowLarkens
121a711265 Fix camera consoles being broke as fuck 2020-07-26 19:52:03 -07:00
Repede
5bc7f0bd72 'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream. 
Also readds vore monkeys
 2020-07-26 12:48:22 -04:00
Rykka
453715bfb3 Fix for Nutrispread not being available and Alternative Method for UE 
Allows you to get Universal Enzymes via the Biogenerator and Nutri-spread from the biogenerator.

Re-color-codes the biogenerator menu.
 2020-07-26 08:05:53 -04:00
izac112
93083fc58b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-26 04:53:18 +02:00