cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,781 Commits 7 Branches 0 Tags
ff69e5cde0d9e66fe8e1337d19d1661fc5ec2a99
Commit Graph

8733 Commits

Author SHA1 Message Date
izac112
4fa6c118af Early port of vorestation #8000 
https://github.com/VOREStation/VOREStation/pull/8000/files
 2020-05-21 21:21:34 +02:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
izac112
8e9b61f7e1 Updates encryptionkey_vr.dm to be in line with our chain of command. 2020-05-20 14:43:30 +02:00
Aronai Sieyes
fc849d9e36 Merge pull request #7962 from VOREStation/Arokha/playsound 
Alter playsound paradigm
 2020-05-19 11:20:52 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
a03a3c0960 Change stack autocombine 
Only happens when dropped or pulled by a mob, to avoid problems with stack-using machines and conveyors in mining
 2020-05-18 22:35:13 -04:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
fe9683b53b Merge pull request #7950 from VOREStation/Arokha/fixmysteryleather 
Fix mystery steel-leather
 2020-05-18 13:59:42 -04:00
Aronai Sieyes
48563200ce VS: Tweak some icon blending 2020-05-18 13:42:42 -04:00
Aronai Sieyes
e3b5d24c8b Obsolete the PROXMOVE flag and uses 2020-05-18 13:31:54 -04:00
Aronai Sieyes
2fca303998 Convert unzooming into listener 2020-05-18 10:47:13 -04:00
Aronai Sieyes
0b858a36c8 These can't be material stacks if they don't have a material 2020-05-18 10:28:18 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Aronai Sieyes
7612c7a149 Merge upstream PR 2020-05-18 09:31:51 -04:00
Aronai Sieyes
6bf0112339 Port Bay's Catwalks 2020-05-17 23:57:21 -04:00
Aronai Sieyes
26efe55d0f Merge pull request #7937 from VOREStation/Arokha/janicart 
New janicart sprites/features
 2020-05-17 22:39:53 -04:00
Aronai Sieyes
5b423cab8b Merge pull request #7933 from VOREStation/Arokha/greyrail 
Add grey railing
 2020-05-17 22:39:01 -04:00
Aronai Sieyes
d69777cb7d Merge pull request #7926 from VOREStation/Arokha/jetpack 
New jetpack sprite from Eris
 2020-05-17 22:38:36 -04:00
Atermonera
5830a7952c Custom RIGs function properly. 2020-05-17 19:15:23 -04:00
Aronai Sieyes
03c805a34a New janicart sprites/features 2020-05-17 16:49:03 -04:00
Aronai Sieyes
f510ad68b1 Add grey railing 2020-05-17 15:49:21 -04:00
Aronai Sieyes
e5177a2a63 New jetpack sprite from Eris 2020-05-17 14:21:06 -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
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
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Aronai Sieyes
b6a0e8b2aa Make blood generation less garbage 2020-05-16 16:22:08 -04:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02: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
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
b3b22daa1d Merge upstream PR 2020-05-15 20:46:03 -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
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