izac112
606b7ec8e5
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-12 21:34:20 +02:00
Aronai Sieyes
fbeda45d2c
Restore large bin to glory
2020-06-10 10:24:03 -04:00
izac112
0b27c91baa
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac
2020-06-09 16:16:14 +02:00
H0lySquirr3l
34dafd1d58
Adds in Food cart to the kitchen. ( #8238 )
...
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
2020-06-09 10:05:56 -04:00
izac112
7ad2832f14
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-08 21:49:14 +02:00
izac112
6758bc8b8c
Fixes our closets tho it may not look like it used to do
2020-06-07 18:34:28 +02:00
Heroman
f55b419803
Slight adjustments + name
2020-06-07 07:09:08 +10:00
Heroman
273f7540b6
Brings some variety and color to back to closets
2020-06-07 06:45:22 +10:00
izac112
6d1afd6f1e
Fixes some closets
2020-06-03 19:08:28 +02:00
izac112
79abbcbc2f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-03 18:30:13 +02:00
Aronai Sieyes
852cdbc347
VS: Add Autolok wall lockers and put some around various maps
2020-05-31 16:59:39 -04:00
Aronai Sieyes
d5de7fc136
Don't let people hide in tiny wall closets
2020-05-31 16:58:57 -04:00
Aronai Sieyes
b7a22c755f
Add icon bases since these are invisible on map otherwise
2020-05-31 13:07:19 -04:00
Aronai Sieyes
7c4428d697
Prep for map updates
2020-05-31 12:39:39 -04:00
Aronai Sieyes
7d69c69f14
VS: Port Bay's lockers and stuff
2020-05-31 12:26:00 -04:00
Aronai Sieyes
719151a74a
Port Bay's lockers, crates, largecrates, wall lockers
2020-05-31 12:26:00 -04:00
Atermonera
619e8b1b94
Ported /tg/ style screen alerts, replacing the hunger icon with them
2020-05-31 11:52:17 -04:00
izac112
0d1fe7d706
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-05-30 16:01:43 +02:00
Aronai Sieyes
8ccb084d54
Merge pull request #8121 from VOREStation/Arokha/morefloor
...
Further Eris floor blending tweaks
2020-05-29 16:05:52 -04:00
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
H0lySquirr3l
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
Atermonera
e7af0b2587
New janicart sprites/features
2020-05-22 20:37:49 -04:00
Aronai Sieyes
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
Atermonera
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
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 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
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
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
Unknown
ff5b1fbd82
Requested Changes
2020-05-14 20:44:27 -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
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
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
