Commit Graph

8438 Commits

Author SHA1 Message Date
Aronai Sieyes
36aa031b1e Merge pull request #7882 from VOREStation/upstream-merge-7162
[MIRROR] Fixes Runtime in ,: bad arg name 'disable_warning'
2020-05-15 20:54:46 -04:00
Atermonera
5e6cbc0315 Fixes Runtime in ,: bad arg name 'disable_warning' 2020-05-15 16:39:04 -04:00
Atermonera
c8e5abc937 Random item spawners qdel properly on init without using sleep (#7134) 2020-05-15 16:36:09 -04:00
Aronai Sieyes
48571fa882 2 catwalk fixes, climbing and decon 2020-05-15 09:06:20 -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
e33c305a9e Add inventory item tooltips 2020-05-14 19:16:40 -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
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
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
7c2698cc7d Fix mounted RCD with radial menu 2020-05-13 16:56:17 -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
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
Aronai Sieyes
48e3bb126a Merge pull request #7828 from VOREStation/aro-o2processing
Clean up air tank processing and initialize
2020-05-13 13:01:46 -04:00
Aronai Sieyes
a5f358b272 Optimize geiger counter processing 2020-05-13 12:12:06 -04:00
Aronai Sieyes
e275031fd1 Optimize suit cooler processing 2020-05-13 11:45:59 -04:00
Aronai Sieyes
94e085740e Optimize flashlight processing 2020-05-13 11:44:56 -04:00
Aronai Sieyes
696bdeec8f Clean up air tank processing and initialize 2020-05-13 11:28:22 -04:00
Aronai Sieyes
f2bd8f138b Make intercom power change stateful 2020-05-13 11:09:12 -04:00
Aronai Sieyes
f380f13c10 Fix whitespace merge 2020-05-11 21:51:21 -04:00
Atermonera
b9c03fe3f1 Port Hover Inventory and Body Indicators 2020-05-11 20:05:03 -04:00
Aronai Sieyes
c672486cd6 Weh.ogg 2020-05-11 17:31:24 -04:00
Aronai Sieyes
23b4342629 Kobold wehs 2020-05-11 17:27:06 -04:00
Rykka
dd187c900d Port over Hover Inventory and Body Zone Hover Indicator
The body zone selector now indicates which body part you are about to select when hovered over, and the hover inventory indicator basically shows where you are trying to put an item, and then shows an item ghost in red or green, giving visual feedback as to if that item will go in the slot or not.

Gifs of this in action:
![https://i.imgur.com/MTi7Kpn.gif](https://i.imgur.com/MTi7Kpn.gif) Body Selection parts.

![https://i.imgur.com/KbLqWKy.gifv](https://i.imgur.com/KbLqWKy.gifv) 
Inventory Icon Overlays!

Credit goes to @ShadowLarkens for original port to Paradise and assistance with port to Virgo. Sending to Polaris ASAP.

- A note on `code/game/objects/items/weapons/storage/internal.dm`, VSCode automatically corrected the line endings, hence the massive filediff. The only practical changes are the addition of `disable_warning = 0`
2020-05-10 07:29:53 -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
Atermonera
f758879431 mechs trigger mines. They're not very effective... (#7113) 2020-05-09 04:27:48 -04:00
Aronai Sieyes
adcc8047d6 Redo teleporter control in nanoui 2020-05-07 21:10:58 -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
ab0f256c64 Add ctrl/alt quick click functions on intercoms for AI 2020-05-06 21:34:01 -04:00
Aronai Sieyes
8cc4a53477 Increase intercom range to world.view 2020-05-06 21:34:01 -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
0b19c528da Allows do_mob and do_after to be exclusive, to prevent stacking 2020-05-05 19:10:55 -04:00
Atermonera
284a0b4d80 Ling Fixes + Various other fixes 2020-05-05 17:02:27 -04:00
Aronai Sieyes
498b942a29 Fiftyspawners try to place themselves in crates if possible
Fixes https://github.com/VOREStation/VOREStation/issues/7163
2020-05-04 21:21:48 -04:00
atlantiscze
b0fad7b55e Allows robots to search loot piles (#7057)
* Allows robots to search loot piles

* Implements feedback
2020-05-03 21:27:29 -04:00
Atermonera
77fef98789 Merge pull request #7010 from atlantiscze/2020_04_17_LoadBalancing
Ports over power-related enhancements and tweaks i coded for Bay a while back
2020-05-03 18:45:25 -04:00
Aronai Sieyes
0cad24568d Fix annoying stupid runtime thing 2020-05-03 17:48:05 -04:00
Aronai Sieyes
23f398a72e Merge pull request #7598 from VOREStation/vplk-rpd
Rapid Pipe Dispenser
2020-05-03 13:07:59 -04:00
Aronai Sieyes
ff07f3e0b0 Merge pull request #7606 from VOREStation/upstream-merge-6960
More fixes for aliens.dm
2020-05-03 12:15:58 -04:00