cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,118 Commits 6 Branches 0 Tags
ad119f676daef3dbe6cb15d701f2651291fc0eaa
Commit Graph

10817 Commits

Author SHA1 Message Date
Rykka
dd2efa029d Bad Formatting, my bad. 2020-05-10 22:00:41 -04:00
Rykka
29037fd40a AI PiP Fixes 
Fixes the undefined icon resulting in this:
![https://i.tigercat2000.net/2020/05/firefox_4x2cbYTrT1.png](https://i.tigercat2000.net/2020/05/firefox_4x2cbYTrT1.png)
Fixes the two buttons being misaligned with the UI.
Fixes double-clicking inside the AI PiP room teleporting the AI Eye out to the room and completely breaking the view. Do note that double-clicking no longer works at all inside the multi-cam room, as a tradeoff for completely preventing UI breaks.
 2020-05-10 21:53:31 -04:00
Aronai Sieyes
dad851b252 Merge pull request #7752 from Rykka-Stormheart/shep-dev-ai-pip 
Add AI Picture-in-Picture Mode!
 2020-05-10 19:00:50 -04:00
Aronai Sieyes
b98f849c82 Merge pull request #7723 from VOREStation/aro-playtimedept 
Add department playtime requirement config, code
 2020-05-10 19:00:38 -04:00
Atermonera
fc8f1951f1 Merge pull request #7107 from VOREStation/pol-holohear 
Prevent holopad chat from going to lobby
 2020-05-10 18:41:00 -04:00
Aronai Sieyes
933ce586c3 Fix AI roundstart join bug 2020-05-10 12:56:13 -04:00
Rykka
3b3a7b960c Add Picture-in-Picture Mode for AI's, Working on Resolving Runtime 
WIP DESC
 2020-05-10 12:31:49 -04:00
Aronai Sieyes
6021131272 Merge pull request #7736 from VOREStation/aro-langissues 
Fix various DM language issues
 2020-05-09 17:38:31 -04:00
Aronai Sieyes
d1e7821b15 VS: Language issues 
These issues don't prevent compiling, but are strange issues nonetheless.
 2020-05-09 16:53:59 -04:00
Aronai Sieyes
320ae99f68 Merge pull request #7722 from Verkister/moremobfixy 
Another bunch of simplemob fixes
 2020-05-08 19:39:19 -04:00
Aronai Sieyes
ea8a068025 Add department playtime requirement config, code 2020-05-08 17:57:56 -04:00
Verkister
a66eafb5cd Another bunch of simplemob fixes 
-Fixes the issue with mob AI not getting properly disabled under player control.
-Fixes mob eye overlays not respecting the mob's scaling setting.
-Fixes the movement cooldown on logged in ridable mobs.
-Fixes direwolf not getting belly icon when resting.
-Makes the mob icon fullness check account for the mob's own size as well.
 2020-05-08 22:54:11 +03:00
Aronai Sieyes
5f8ce48793 Merge pull request #7710 from VOREStation/upstream-merge-7064 
[MIRROR] Adds preference to control multilingual behaviour
 2020-05-08 14:55:46 -04:00
Aronai Sieyes
069b8829ad Update say.dm 2020-05-08 14:44:54 -04:00
Aronai Sieyes
92c3cf7345 Merge pull request #7706 from VOREStation/aro-holohear 
Prevent holopad chat from going to lobby
 2020-05-08 14:43:22 -04:00
Aronai Sieyes
aee55fbd00 Merge pull request #7705 from VOREStation/aro-lessrude 
Make multikey warning less rude
 2020-05-08 14:43:12 -04:00
Aronai Sieyes
dd3d4f4cfe Refactor spawn_checks_vr and when it is called 2020-05-08 13:34:31 -04:00
Atermonera
ee07d117f2 Adds preference to control multilingual behaviour 2020-05-08 00:43:57 -04:00
Aronai Sieyes
67c8945a66 Prevent holopad chat from going to lobby 2020-05-07 21:34:21 -04:00
Aronai Sieyes
84ed809604 Make multikey warning less rude 2020-05-07 21:29:10 -04:00
Aronai Sieyes
393366a825 Refactor job joins for noncarbons 2020-05-07 19:48:25 -04:00
Aronai Sieyes
c3e820165b Fix species with slowdown instead being super fast 2020-05-07 00:18:54 -04:00
Aronai Sieyes
ae303cd122 Merge pull request #7676 from VOREStation/aro-bicon2 
Refactor examining and some of getFlatIcon
 2020-05-06 23:21:41 -04:00
Aronai Sieyes
d56980bf01 Add some un-push helpers 2020-05-06 20:28:10 -04:00
Aronai Sieyes
e55f9d2deb Add Goon-style pushing 2020-05-06 20:27:55 -04:00
Aronai Sieyes
b2fa5ec136 Move all mob movement cooldowns into one proc 2020-05-06 20:27:22 -04:00
Aronai Sieyes
9acf643828 Make DS2NEARESTTICK macro 2020-05-06 20:26:51 -04:00
Aronai Sieyes
bd298810f2 Redo examining in general and tweak getFlatIcon 2020-05-06 18:37:46 -04:00
Aronai Sieyes
d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04:00
Aronai Sieyes
586dcad6a1 Merge pull request #7655 from VOREStation/aro-doingafter 
Make some progress bar activities exclusive
 2020-05-05 19:47:08 -04:00
Aronai Sieyes
c9f67a2396 Merge pull request #7656 from VOREStation/upstream-merge-7060 
[MIRROR] Ling Fixes + Various other fixes
 2020-05-05 19:46:57 -04:00
Atermonera
34a2d38f3b Merge pull request #7077 from Mechoid/KururakTweaks 
Kururaks now (theoretically) are not as agonizing to fight.
 2020-05-05 17:18:03 -04:00
Atermonera
284a0b4d80 Ling Fixes + Various other fixes 2020-05-05 17:02:27 -04:00
Aronai Sieyes
c5e8685593 Port Paradise progress bars 2020-05-05 16:51:05 -04:00
Aronai Sieyes
e8cae15ed8 Don't show borgs alarms not local to them 2020-05-05 12:31:29 -04:00
Aronai Sieyes
72511b9fa7 Rewords grab facesits 
Let's be real here. It's facesits.
 2020-05-04 23:21:46 -04:00
Cyantime
fe8878985b Allows dogborg barks to be disabled 2020-05-04 16:16:56 -04:00
Aronai Sieyes
d81cc57ebf Merge pull request #7602 from KasparoVy/the-marked-one 
Adds 2 New Ears, a Tail & a Few Markings
 2020-05-03 13:05:22 -04:00
Novacat
d8633ba51f Merge pull request #7594 from VOREStation/upstream-merge-7069 
[MIRROR] Fix Temp check.
 2020-05-03 12:39:31 -04:00
Aronai Sieyes
2db976ca6c Update life.dm 2020-05-03 12:17:41 -04:00
Atermonera
3ff0557e43 Fix Temp check. 2020-05-03 12:17:28 -04:00
Aronai Sieyes
64b70bdd6d Merge pull request #7597 from VOREStation/aro-movetweak 
Improve various smooth movement things
 2020-05-03 12:10:59 -04:00
Novacat
5a8174c025 Merge pull request #7569 from VOREStation/upstream-merge-6960 
[MIRROR] Explorer Expansion: New Horizons
 2020-05-03 11:34:29 -04:00
Aronai Sieyes
f6394b0c6a Un-anger the byond demons even though this has been here for years 2020-05-03 11:25:29 -04:00
Leshana
e1120409ac Respect buckle_movable 
- Only allow moving what you're buckled to of buckle_movable
- Fix buckle_movable values on some items.
 2020-05-03 09:49:25 -04:00
Leshana
57285beb6c MultiZ Pulling Fixes 
- Prevent pulling anchored stuff up stairs.
- Prevent pulling stuff up/down z-levels thru ladders.
 2020-05-03 09:49:25 -04:00
Unknown
2bce699cb2 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6960 2020-05-03 09:47:45 -04:00
Unknown
9a156b4570 Travis fix 2020-05-03 09:40:35 -04:00
Atermonera
23e72aa709 Merge pull request #7043 from MisterLayne/prommie-lang 
Promethean Language
 2020-05-03 03:14:21 -04:00
KasparoVy
eba6e230d1 Adds 2 New Ears, a Tail & a Few Markings 
Adds short/terrier & thin/jackal Vulpkanin ears (dual-colourable)
Adds a dual-colourable tail inspired by Ward-Takahaski cybernetics.
Adds a few markings:
--> Vulp Short Nose (shifted 1 pixel closer to the face in the east/west sprites)
--> Vulp Alt. Face (Vulpine facial hair but in marking form)
--> Taj Alt. Nose (Tajaran nose marking but colour mult & the same colour in all dirs)
--> Talons (Inspired by Ward-Takahashi Spirit markings)
--> Claws (Inspired by Ward-Takahashi Spirit markings)
 2020-05-03 02:25:21 -04:00