Commit Graph

37733 Commits

Author SHA1 Message Date
Aronai Sieyes
cc6592e35c Update revinfo proc 2020-05-15 11:21:30 -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
fa651b0383 Merge pull request #7861 from VOREStation/aro-dmapiup
DMAPI to 5.1.1
2020-05-15 10:27:37 -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
2c2e9c8e0d v e n d o t t 2020-05-14 22:29:16 -04:00
Aronai Sieyes
e4ec1580cc Adds ottah plush 2020-05-14 22:11:01 -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
b41ba2fba9 Merge pull request #7856 from VOREStation/aro-itemtips
Add inventory item tooltips
2020-05-14 19:28:44 -04:00
Aronai Sieyes
e33c305a9e Add inventory item tooltips 2020-05-14 19:16:40 -04:00
Aronai Sieyes
a537ef77fa Further tweak alerts 2020-05-14 18:14:10 -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
b020a3d9b4 Add updown buttons to ghost, AI HUDs 2020-05-14 16:52:16 -04:00
Aronai Sieyes
3992b7a50a Add observer HUD from /tg/, refactor HUDs 2020-05-14 16:29:15 -04:00
Aronai Sieyes
9307fa0738 Further alert holo tweaks 2020-05-14 13:04:14 -04:00
Aronai Sieyes
44b5c4411c Revive alert tweak 2020-05-14 12:36:07 -04:00
Aronai Sieyes
ebe252d988 Further add on to the alert system 2020-05-14 12:26:20 -04:00
Aronai Sieyes
80090ab5ef Merge pull request #7845 from VOREStation/upstream-merge-7080
[MIRROR] Add UAVs
2020-05-14 10:08:49 -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
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
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
f20e5eff26 Merge pull request #7841 from VOREStation/aro-stackicons
New stack icons for stack items
2020-05-13 17:58:36 -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
d47291ca69 New stack icons for stack items 2020-05-13 17:43:57 -04:00
Aronai Sieyes
483f1bb62c Merge pull request #7840 from VOREStation/aro-rigrcd
Fix mounted RCD with radial menu
2020-05-13 17:14:06 -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
a7e0cf9190 Merge pull request #7836 from VOREStation/aro-rigopti
Only process rigs on a person
2020-05-13 17:01:32 -04:00
Aronai Sieyes
7c2698cc7d Fix mounted RCD with radial menu 2020-05-13 16:56:17 -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
bce613704c Fix sofa icon layering 2020-05-13 14:51:53 -04:00
Aronai Sieyes
e949f3d7de Merge pull request #7833 from VOREStation/aro-geiger
Optimize geiger counter processing
2020-05-13 13:02:12 -04:00
Aronai Sieyes
531714d78b Merge pull request #7832 from VOREStation/aro-lights
Optimize lighting processing
2020-05-13 13:02:08 -04:00
Aronai Sieyes
c47b6c2a19 Merge pull request #7830 from VOREStation/aro-suitcooler
Optimize suit cooler processing
2020-05-13 13:02:01 -04:00
Aronai Sieyes
2294d6f2ca Merge pull request #7829 from VOREStation/aro-flashlight
Optimize flashlight processing
2020-05-13 13:01:55 -04:00