Commit Graph

1169 Commits

Author SHA1 Message Date
Rykka
16da38037d Fix incoming merge conflicts with PR #8757
NIF Heatsinks will preserve their behavior of preventing BASE heat increases, but will not be able to compensate for if your NEW heatsink component is damaged or disabled.

Robolimb damage remains scalable as the conflict was simply taht the check was indented/nested underneath another.
2020-08-21 05:26:49 -04:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
SplinterGP
cf491a56b7 Gives FBP's a proc to change their monitor display without using a mask item. 2020-08-20 21:25:20 -04:00
SplinterGP
409bd14a6f adds more jeanne displays 2020-08-20 21:17:54 -03:00
SubberTheFabulous
eb48eef20e Adds New Prosthetics Set (#7467)
* Adds a new FBP CS set, removes old alt2

* Adds a new FBP CS set, removes old alt2

* Readds Cyber Solutions - Array

* Readds Cyber Solutions - Array

* Adds a new FBP CS set

Changelog
2020-08-17 18:04:54 -04:00
Repede
6b538466bd Merge branch 'master' into Mapping 2020-08-13 19:35:13 -04:00
SplinterGP
01c798bd3f removes my ckey from the allowed list, used on test 2020-08-13 19:16:01 -03:00
SplinterGP
251d2fd8dd Jeanne nanovulp fluff robolimbs 2020-08-13 19:05:23 -03:00
SplinterGP
41b4c7f604 Early ports FBP monitor display replacement 2020-08-13 18:43:32 -03:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
Repede
74ee6f30f2 new white gearharness and redid yw xion sprites, added new gear harness to loadout for public use 2020-08-07 19:25:27 -04:00
Novacat
6866cf2cbf Merge pull request #8601 from Rykka-Stormheart/shep-dev-mulebot-steppies-fix
Fix Mulebot Crossed() Code, allows simplemobs to be crushed if laying
2020-08-07 00:29:58 -04:00
Rykka
86bf733872 Fix Mulebots running over themselves, fix runtime with blood.dm 2020-08-05 22:18:13 -04:00
Cyantime
78ec7a7733 Fix promethean revival flavor text and OOC notes 2020-08-05 05:26:03 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Killian
84128e72ff blood mechanics tweaks (#7377) 2020-07-31 04:54:11 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Repede
baaf131730 Alt pattern for the xion outfit: named xion (yw alt) - Spritefix by whiteout 2020-07-06 19:22:22 -04:00
Novacat
9fee4f4c7b Merge pull request #8367 from KillianKirilenko/kk-fixes
Update robolimbs_vr.dm
2020-07-06 07:31:53 -04:00
Killian
89b1cc659f Update robolimbs_vr.dm 2020-07-06 08:47:42 +01:00
Novacat
33e07ac92d Merge pull request #8091 from Cameron653/transparency_v2
Adds the ability for prometheans to toggle transparency.
2020-07-03 17:49:45 -04:00
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
Aronai Sieyes
6fbbe840fe Fix defib timer on MMIs 2020-06-05 15:55:08 -04:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Atermonera
619e8b1b94 Ported /tg/ style screen alerts, replacing the hunger icon with them 2020-05-31 11:52:17 -04:00
izac112
e45ac4c224 one more fix 2020-05-27 22:44:09 +02:00
izac112
be538243c1 various fixes 2020-05-27 22:43:33 +02:00
Cameron653
846c8b7b16 This should all work, but I'm getting unrelated compile errors. 2020-05-27 14:19:30 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02: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
3237ae96d7 Merge pull request #7987 from VOREStation/Arokha/talks
Talking changes
2020-05-20 16:09:40 -04:00
Aronai Sieyes
50e09c0ee7 Fix a few talking issues
Posibrain talking without a language, give speech bubbles to things inside things, especially posibrains, give gibberish a chance instead of using null languages
2020-05-20 13:52:08 -04:00
Atermonera
c3e5e6c1f1 Edit Appearance and Change Appearance update icon sex 2020-05-19 21:54:38 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -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
4bfe8412f4 Tweak math to be faster in ext organs 2020-05-16 22:39:13 -04:00
Aronai Sieyes
c0ef0be827 VS: Tweak VS edits to external organs
Might look like it's removing protection for people in bellies, but that code is old and is checking if they're in a mob. They aren't, they're in a belly obj, so that code hasn't been effective anyway!
2020-05-16 18:24:54 -04:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02: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
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07: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
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045
[MIRROR] Removes limits on eating, centralizes nutrition changing.
2020-04-29 19:23:55 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Novacat
2ffcf2c685 Merge pull request #6960 from Holdelta/VS-Custom-DSITeshari
Allowing Custom Species access to DSI - Teshari prosthetic limbs.
2020-04-19 23:03:25 -04:00
Repede
e44e346352 Release Update
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme
2020-04-16 21:07:33 -04:00