cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,570 Commits 8 Branches 0 Tags
a77da3b5df1dfcd33b9f645c3e576a77d3db8556
Commit Graph

24877 Commits

Author SHA1 Message Date
Arokha Sieyes
a77da3b5df Clean up merge conflicts 2020-05-14 09:44:52 -04:00
Atermonera
21620a1814 Add UAVs 2020-05-14 00:34:29 -04:00
Aronai Sieyes
d895dba8f1 Merge pull request #7838 from VOREStation/aro-dmapi 
Upgrade DMAPI to 5.1.0
 2020-05-13 17:52:52 -04:00
Aronai Sieyes
e34081ccf8 Merge pull request #7839 from VOREStation/aro-blindness 
Fix a blindness bug
 2020-05-13 17:01:57 -04:00
Aronai Sieyes
6665ea79f4 Merge pull request #7837 from VOREStation/aro-botwho 
Rearrange staffwho bot command output
 2020-05-13 17:01:44 -04:00
Aronai Sieyes
69cff1bd64 Fix a blindness bug 2020-05-13 16:24:56 -04:00
Aronai Sieyes
d78f595352 Upgrade DMAPI to 5.1.0 2020-05-13 16:00:16 -04:00
Aronai Sieyes
067993428b One more rig cleanup 2020-05-13 15:52:44 -04:00
Aronai Sieyes
8bf640ab2b Rearrange staffwho bot command output 2020-05-13 15:48:35 -04:00
Aronai Sieyes
719031edec Only process rigs on a person 2020-05-13 15:12:51 -04:00
Aronai Sieyes
132ace7ab5 Optimize lighting processing 2020-05-13 12:16:01 -04:00
Aronai Sieyes
e3db9322f0 Merge pull request #7825 from Rykka-Stormheart/shep-dev-photocopier 
Tweaks to Photocopier, Adjust NanoUI, and allow Butt Photocopying!
 2020-05-13 09:57:40 -04:00
Aronai Sieyes
6f7db925cc Merge pull request #7820 from VOREStation/aro-blobspeed 
Fix ultimate sanic blob
 2020-05-13 09:51:16 -04:00
Rykka
e29648e47c Add some placeholders so they can at least get furry/scaley butts. 2020-05-13 06:28:00 -04:00
Rykka
fd656e06dd Tweaks to Photocopier, Adjust NanoUI, and allow Butt Photocopying! 
You can photocopy your ass!

It will use 10 toner per (original) photo, and will use your base species!

If you're a custom species and have icon set to Vulpkanin, for instance, it will use the vulp ass. Werewolves will use the vulp for now, pending a thicc'er sprite.

Xenos + Xenohybrid will use THICC XENOS ASS sprites.

Xenochimera will work the same as custom species, using the base species ass.

The rest of the species not currently implemented (that is, those without sprites) will print a generic human butt. If you'd like custom sprites, sprite an ass, and put it in butts_vr.dmi

Improvements to photocopiers will be pushed forward to Polaris.

You can also tell precisely who's ass it is on the photo by clicking on it. 
![https://i.imgur.com/UOPhfIt.gifv](https://i.imgur.com/UOPhfIt.gifv)

I'd still like to add the option to recolor the sprite based on your body color, but for now, it's a black/white ass. Sorry!
 2020-05-13 06:20:44 -04:00
Arokha Sieyes
4d7012c2ae Fix ultimate sanic blob 2020-05-13 00:15:35 -04:00
Arokha Sieyes
643e4b4af2 Update overlaying on hydro trays to be more reasonable. 2020-05-13 00:07:08 -04:00
Aronai Sieyes
fd817c4d16 Merge pull request #7814 from VOREStation/aro-hungryman 
Port tg/other hunger icons, and give synths their own
 2020-05-12 20:00:23 -04:00
Aronai Sieyes
3ed02c65fe Merge pull request #7813 from VOREStation/aro-gurglog 
Reduce admin log spam
 2020-05-12 19:53:04 -04:00
Aronai Sieyes
512b9f1b21 Give bloodsuckers a different hunger icon 2020-05-12 19:15:48 -04:00
Aronai Sieyes
e9247c1722 Port tg/other hunger icons, and give synths their own 2020-05-12 18:43:41 -04:00
Aronai Sieyes
0327a2d186 Reduce admin log spam 2020-05-12 17:08:41 -04:00
Nepox
0ffb4c81a0 Fixes missing sprite from Honeybuns 
It should work now.
 2020-05-12 21:14:41 +02:00
Aronai Sieyes
31d69d016d Fix an exploit 2020-05-12 14:21:10 -04:00
Aronai Sieyes
d93b580723 Merge pull request #7804 from radar651/MedHUDpatch 
MedHUD Patch
 2020-05-12 11:47:49 -04:00
Aronai Sieyes
3486770bc7 Merge pull request #7806 from VOREStation/aro-staffwhobot 
Adminnery!
 2020-05-12 11:46:44 -04:00
Aronai Sieyes
967c9fb9e2 Merge pull request #7802 from Novacat/nova-pathfinder 
Fixes a typo in pathing
 2020-05-12 11:45:32 -04:00
Aronai Sieyes
715066ba80 Merge pull request #7785 from Heroman3003/borg_pto 
Allows Cyborgs and AI to earn PTO and departmental playtime
 2020-05-12 11:36:01 -04:00
Aronai Sieyes
2b6779f4d3 VS: Staffwho chat command and update to status command 2020-05-12 11:17:45 -04:00
Aronai Sieyes
d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
radar651
3a245943d3 MedHUD Patch 
Medical hud patch. Arrr.
 2020-05-12 10:29:29 -04:00
Unknown
08a336e582 Fixes a typo in pathing 2020-05-12 07:48:49 -04:00
Aronai Sieyes
4ff57116b4 Merge pull request #7793 from VOREStation/upstream-merge-7125 
[MIRROR] Ports Vore Telecomms Sprites
 2020-05-11 22:39:20 -04:00
Aronai Sieyes
4f89fc535f Fix cheeky icon port 2020-05-11 22:08:14 -04:00
Aronai Sieyes
96da7be01b Put APCs and SMESes into GLOB lists to ease iteration 2020-05-11 22:05:41 -04:00
Atermonera
29ed593881 Ports Vore Telecomms Sprites 2020-05-11 20:02:11 -04:00
Atermonera
d6e369178b Merge pull request #7128 from KillianKirilenko/kk-fashion2 
[PORT] Military Jackets
 2020-05-11 20:01:59 -04:00
Aronai Sieyes
9e3c04b7e1 Fix missing dash breaking numbers in URL ends 2020-05-11 17:58:45 -04:00
Heroman
fb8e2680b0 Allows Cyborgs and AI to earn PTO and departmental playtime 2020-05-12 07:24:33 +10:00
Aronai Sieyes
9648659eb1 Merge pull request #7778 from VOREStation/aro-statuschange 
Tweak bot status command
 2020-05-11 14:36:16 -04:00
Aronai Sieyes
84afeed8af Fix OOC notes requirement 2020-05-11 14:14:50 -04:00
Aronai Sieyes
f6b692cb88 Tweak bot status command 2020-05-11 14:12:27 -04:00
Aronai Sieyes
100e3816c0 Merge pull request #7773 from ShadowLarkens/ai_fixes 
Fix AI multicam exploits & a few other bugs
 2020-05-11 01:03:39 -04:00
Aronai Sieyes
3e0932093d Re-init regexes and other statics 2020-05-11 00:17:55 -04:00
ShadowLarkens
9cf164d66c Fix AI multicam exploits & a few other bugs 2020-05-10 21:15:52 -07:00
Aronai Sieyes
7dcd7efd67 Testing init fixes 2020-05-10 23:40:47 -04:00
Aronai Sieyes
ba46116ce7 Merge pull request #7762 from VOREStation/upstream-merge-7107 
[MIRROR] Prevent holopad chat from going to lobby
 2020-05-10 22:10:54 -04:00
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