Commit Graph

24898 Commits

Author SHA1 Message Date
Aronai Sieyes
f0930ca045 Merge pull request #7874 from VOREStation/aro-ocuround
Round hours shown on occupations page
2020-05-15 20:52:01 -04:00
Arokha Sieyes
90d917106a Fix bad arg 2020-05-15 12:02:12 -04:00
Aronai Sieyes
c01752681f Merge pull request #7862 from VOREStation/upstream-merge-7052
[MIRROR] Refactor Move() Code
2020-05-15 10:50:21 -04:00
Aronai Sieyes
2798088241 Merge move 2020-05-15 10:38:27 -04:00
Aronai Sieyes
08f857e296 Merge pull request #7864 from VOREStation/aro-cats
2 catwalk fixes, climbing and decon
2020-05-15 10:28:07 -04:00
Aronai Sieyes
48571fa882 2 catwalk fixes, climbing and decon 2020-05-15 09:06:20 -04:00
Atermonera
fca5011fdc Refactor Move() Code 2020-05-15 01:05:43 -04:00
Aronai Sieyes
4c9bced82d DMAPI to 5.1.1 2020-05-15 00:34:42 -04:00
Aronai Sieyes
e1db9271e1 Merge pull request #7858 from VOREStation/aro-secsprite
New HOS coat, warden jacket sprites
2020-05-14 20:54:13 -04:00
Unknown
ff5b1fbd82 Requested Changes 2020-05-14 20:44:27 -04:00
Aronai Sieyes
9d76b140dd Fix hyphen 2020-05-14 20:17:58 -04:00
Aronai Sieyes
0101cd85ca New HOS coat, warden jacket sprites 2020-05-14 20:07:33 -04:00
Aronai Sieyes
e33c305a9e Add inventory item tooltips 2020-05-14 19:16:40 -04:00
Aronai Sieyes
41ce91e044 Merge pull request #7854 from VOREStation/aro-slemruntime
Fix xenobio AI runtime
2020-05-14 18:12:36 -04:00
Aronai Sieyes
819e1a863e Merge pull request #7853 from VOREStation/aro-glovetime
Fix glove runtime
2020-05-14 18:12:25 -04:00
Aronai Sieyes
b1f65b6d27 Fix xenobio AI runtime 2020-05-14 16:59:39 -04:00
Aronai Sieyes
157ee6773d Fix glove runtime 2020-05-14 16:58:50 -04:00
Aronai Sieyes
3992b7a50a Add observer HUD from /tg/, refactor HUDs 2020-05-14 16:29:15 -04:00
Aronai Sieyes
44b5c4411c Revive alert tweak 2020-05-14 12:36:07 -04:00
Aronai Sieyes
3bbec85296 Merge pull request #7843 from ShadowLarkens/screenalerts
Ported /tg/ style screen alerts, replacing the hunger icon with them
2020-05-14 09:52:06 -04:00
ShadowLarkens
17c80270e4 Fix broken span 2020-05-13 19:53:42 -07:00
ShadowLarkens
f905cfc020 Ported /tg/ style screen alerts, replacing the hunger icon with them
This adds throw_alert() and /obj/screen/alert, a system that allows you
to do custom hud alerts for any variety of things from "You're too
cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. The
xenochimera feral indicator would probably be a good candidate for
conversion, but I didn't touch it in this PR. There's also a number of
new alerts, such as blindness, highness, legcuffed, buckled, handcuffed,
and probably some more I missed; read code/_onclick/hud/alert.dm and see
for yourself!

Additionally, a number of tweaks have been done to resisting code, to
make it so that there's an indicator when you're buckled or handcuffed,
and can just click the alert to start resisting. This includes a
refactor that combines the logic for lockers, holders, micros
escaping from shoes, and struggling in a gut all into one proc, called
container_resist(). This means that vore bellies actually no longer need
the resist override, but it's been left in place just in case someone
finds something else they want to use it for.

Also, the health and internals indicator got moved down one tile each.
Needed room for the alerts. If we add the oxygen tank action buttons
from /tg/ and remove the internals indicator, the health indicator can
go back where it was originally.
2020-05-13 19:36:01 -07: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