cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
80,514 Commits 10 Branches 0 Tags
tracy
Commit Graph
2733 Commits
Author SHA1 Message Date
Aronai Sieyes 12af6afc9b Alter playsound paradigm 2020-05-29 14:54:11 -04:00
Aronai Sieyes 6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
izac112 e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
H0lySquirr3landGitHub 357047e249 Add files via upload 2020-05-24 18:31:19 -05:00
Aronai Sieyes c7502996f4 Merge upstream PR 2020-05-22 20:55:32 -04:00
AtermoneraandVirgoBot e7af0b2587 New janicart sprites/features 2020-05-22 20:37:49 -04:00
Aronai SieyesandGitHub 9af470047e Merge pull request #8013 from VOREStation/upstream-merge-7183 
[MIRROR] Swarm Balancing Upkeep
 2020-05-21 16:07:29 -04:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
AtermoneraandVirgoBot 2b702e3a26 Merge pull request #7183 from Mechoid/SwarmPylonUpkeep 
Swarm Balancing Upkeep
 2020-05-21 14:41:18 -04:00
Aronai Sieyes c6b4eddefb Fix sinks washing things at a distance 2020-05-21 13:08:11 -04:00
Razgriz 3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -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
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 SieyesandVirgoBot 6bf0112339 Port Bay's Catwalks 2020-05-17 23:57:21 -04:00
Aronai SieyesandGitHub 26efe55d0f Merge pull request #7937 from VOREStation/Arokha/janicart 
New janicart sprites/features
 2020-05-17 22:39:53 -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
izac112 a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
izac112 bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Aronai Sieyes b3b22daa1d Merge upstream PR 2020-05-15 20:46:03 -04:00
AtermoneraandVirgoBot 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
Unknown ff5b1fbd82 Requested Changes 2020-05-14 20:44:27 -04:00
Aronai SieyesandGitHub 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 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 bce613704c Fix sofa icon layering 2020-05-13 14:51:53 -04:00
izac112 1e6cc7d5a8 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into izac-voreupdate 2020-05-11 20:07:45 +02:00
izac112 2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Razgriz 81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07: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
izac112 e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Killian 1f3d901274 update misc. files 2020-05-06 13:22:00 +01:00
RadiantFlash7 0071485ca0 Interceptor adjustments 2020-05-05 21:29:31 -04:00
Killian 19c223c940 forgot a comma 2020-05-05 11:28:20 +01:00
Killian 6494e48c7a small update to secpilot locker contents 2020-05-05 11:24:07 +01:00
KillianandGitHub 8240a97400 Merge branch 'master' into kk-miscstuff 2020-05-04 14:20:02 +01:00
atlantisczeandVirgoBot b0fad7b55e Allows robots to search loot piles (#7057) 
* Allows robots to search loot piles

* Implements feedback
 2020-05-03 21:27:29 -04:00
AtermoneraandVirgoBot 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 SieyesandGitHub 64b70bdd6d Merge pull request #7597 from VOREStation/aro-movetweak 
Improve various smooth movement things
 2020-05-03 12:10:59 -04:00
Leshana e1120409ac Respect buckle_movable 
- Only allow moving what you're buckled to of buckle_movable
- Fix buckle_movable values on some items.
 2020-05-03 09:49:25 -04:00
Unknown 2bce699cb2 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6960 2020-05-03 09:47:45 -04:00
Aronai Sieyes 0b18d17a07 Further tweak smooth movement 2020-05-02 19:20:54 -04:00
Aronai Sieyes 1c76891063 Objects fall through when catwalk opened 2020-05-01 14:37:31 -04:00
Unknown 6a296e932e Conflict Resolution 2020-05-01 14:34:33 -04:00
MechoidandVirgoBot 7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Aronai Sieyes 6cc54f6edd Always initialize plated catwalks for you 2020-05-01 14:12:25 -04:00
Aronai Sieyes d650dbe87a Port Bay's Catwalks 
Allows for various new funtimes.
 2020-05-01 13:00:39 -04:00