cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,645 Commits 5 Branches 0 Tags
7757e4e7dda5dbbcef62a0455569682680677990
Commit Graph

24914 Commits

Author SHA1 Message Date
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
63cf68c2f0 Merge pull request #7878 from VOREStation/upstream-merge-7114 
[MIRROR] Fixes #649
 2020-05-15 20:53:16 -04:00
Aronai Sieyes
9748b077ef Merge pull request #7876 from VOREStation/aro-detsuit 
Move cyberpunk detective gear to be suits, add long version
 2020-05-15 20:52:43 -04:00
Aronai Sieyes
b419e79166 Merge pull request #7873 from VOREStation/aro-conf 
Fix item-based alerts, and add a confused alert
 2020-05-15 20:52:14 -04:00
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
Aronai Sieyes
b3b22daa1d Merge upstream PR 2020-05-15 20:46:03 -04:00
Aronai Sieyes
259e33da5d Merge conflict fix for 7162 2020-05-15 20:23:49 -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
3057230bb2 Fixes #649 (#7114) 2020-05-15 16:33:17 -04:00
Aronai Sieyes
a23605c9fd Move cyberpunk detective gear to be suits, add long version 2020-05-15 14:17:34 -04:00
Atermonera
02f82fc1f0 Refactor move/click code and cooldowns 2020-05-15 14:03:15 -04:00
Aronai Sieyes
6873a3238d Add confused alert 2020-05-15 13:43:24 -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