cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,712 Commits 6 Branches 0 Tags
b8a5c118a4fb5c6d5a2f16d15d80b29538f99c2b
Commit Graph

16857 Commits

Author SHA1 Message Date
Aronai Sieyes
b8a5c118a4 New holopad icon 2020-05-17 15:38:52 -04:00
Aronai Sieyes
94c02f85c1 Merge pull request #7917 from VOREStation/Arokha/squeez 
Attempt some performance improvements
 2020-05-17 10:17:24 -04:00
Aronai Sieyes
0f1d00d13b Make the global announcer really global 2020-05-17 10:00:45 -04:00
Aronai Sieyes
0bad4363b8 Sleep AI processing when nobody on their Zlevel 2020-05-17 10:00:45 -04:00
Aronai Sieyes
78e0847f77 Merge pull request #7918 from VOREStation/Arokha/proteanshake 
Add protean shakes
 2020-05-17 09:26:12 -04:00
Aronai Sieyes
1063ded44f Merge pull request #7919 from VOREStation/Arokha/pedantry 
Just moves this code block
 2020-05-17 09:26:00 -04:00
Arokha Sieyes
3911e14936 tg(?) style stack autocombining 2020-05-17 00:47:42 -04:00
Arokha Sieyes
5e3e7e4bab Just moves this code block 2020-05-17 00:38:07 -04:00
Arokha Sieyes
e91418fa6d Add protean shakes 2020-05-17 00:05:01 -04:00
Novacat
50ab41e56f Merge pull request #7916 from VOREStation/upstream-merge-7146 
[MIRROR] Small overhaul of floor icon generation
 2020-05-16 23:08:56 -04:00
Aronai Sieyes
7aaf084086 Update floor_icon.dm 2020-05-16 22:45:12 -04:00
Atermonera
97af508312 Small overhaul of floor icon generation 2020-05-16 22:28:39 -04:00
Aronai Sieyes
b21d384a2e Further molest revdata 2020-05-16 18:36:06 -04:00
Aronai Sieyes
b6a0e8b2aa Make blood generation less garbage 2020-05-16 16:22:08 -04:00
Aronai Sieyes
0775d9e19c Merge pull request #7901 from VOREStation/Arokha/issue7877 
Fixes mousedrop shenanigans
 2020-05-16 12:46:42 -04:00
Aronai Sieyes
2b96e0bfae Fixes mousedrop shenanigans 2020-05-16 12:13:24 -04:00
Aronai Sieyes
b8eed3cd6d Merge pull request #7897 from Rykka-Stormheart/shep-dev-ai-open-this-door 
Port over AI Opening Doors from Paradise
 2020-05-16 11:45:15 -04:00
Rykka
3c1c5ab3e4 Port over AI Opening Doors from Paradise 
This makes an [OPEN] link appear on all radio messages the AI hears (to the right of the follow link). When clicked, it allows the AI to open
the door nearest to the speaker (or, if it is a voice changer, the door
nearest to the poor sap who had his voice stolen).

AI, Open This Door!
 2020-05-16 01:56:24 -04:00
Atermonera
8b0a581e5d Merge pull request #7139 from KillianKirilenko/kk-gps 
Even More GPS Variety
 2020-05-15 21:07:00 -04:00
Aronai Sieyes
7757e4e7dd Merge pull request #7875 from VOREStation/upstream-merge-7082 
[MIRROR] Refactor move/click code and cooldowns
 2020-05-15 20:57:31 -04:00
Aronai Sieyes
32ae9bcd6b Merge pull request #7883 from VOREStation/aro-erishud 
Add mini HUDs to mechs, rigs
 2020-05-15 20:54:58 -04:00
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
Aronai Sieyes
71271c0274 Merge pull request #7881 from VOREStation/upstream-merge-7148 
[MIRROR] cleans up advanced_who output
 2020-05-15 20:54:31 -04:00
Aronai Sieyes
b3b22daa1d Merge upstream PR 2020-05-15 20:46:03 -04:00
Aronai Sieyes
cb36e93a30 Add mini HUDs to mechs, rigs 2020-05-15 17:14:29 -04:00
Atermonera
5e6cbc0315 Fixes Runtime in ,: bad arg name 'disable_warning' 2020-05-15 16:39:04 -04:00
Atermonera
b6c8d31829 cleans up advanced_who output (#7148) 
* cleans up advanced_who output

* Missing tag
 2020-05-15 16:37:35 -04:00
Atermonera
c8e5abc937 Random item spawners qdel properly on init without using sleep (#7134) 2020-05-15 16:36:09 -04:00
Atermonera
02f82fc1f0 Refactor move/click code and cooldowns 2020-05-15 14:03:15 -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
6665ea79f4 Merge pull request #7837 from VOREStation/aro-botwho 
Rearrange staffwho bot command output
 2020-05-13 17:01:44 -04:00
Aronai Sieyes
7c2698cc7d Fix mounted RCD with radial menu 2020-05-13 16:56:17 -04:00
Aronai Sieyes
8bf640ab2b Rearrange staffwho bot command output 2020-05-13 15:48:35 -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