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,642 Commits 6 Branches 0 Tags
32ae9bcd6b5c331e240305dbf3283334be4f341e
Commit Graph

16835 Commits

Author SHA1 Message Date
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
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
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
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
3486770bc7 Merge pull request #7806 from VOREStation/aro-staffwhobot 
Adminnery!
 2020-05-12 11:46:44 -04:00
Aronai Sieyes
b5099328a5 Merge pull request #7800 from VOREStation/aro-moresafe 
Additional safety around job hour checks
 2020-05-12 11:36:14 -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
1cc015f9aa Add a staffwho for programmatic use 2020-05-12 11:17:30 -04:00
Aronai Sieyes
d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
Heroman
25a7bde56f Removes redundant check for AI 2020-05-12 18:35:51 +10:00
Arokha Sieyes
bf166a2d42 Additional safety around job hour checks 2020-05-12 01:01:10 -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
cb0d96717b Merge pull request #7798 from VOREStation/aro-apclist 
Put APCs and SMESes into GLOB lists to ease iteration
 2020-05-11 22:25:17 -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
Aronai Sieyes
47803320f7 Merge pull request #7796 from VOREStation/upstream-merge-7135 
[MIRROR] Port Hover Inventory and Body Indicators
 2020-05-11 22:04:40 -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
Atermonera
29ed593881 Ports Vore Telecomms Sprites 2020-05-11 20:02:11 -04:00
Atermonera
1eeaf32a92 Ports Aurora record laptop sprites 2020-05-11 19:26:21 -04:00