f00fdebbb9
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
...
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
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
50834e4a7b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-02 23:52:01 +02:00
84128e72ff
blood mechanics tweaks ( #7377 )
2020-07-31 04:54:11 -04:00
65cfe5f6e3
Implements Status Indicators
2020-07-30 15:30:44 -04:00
1456af50f7
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-14 00:21:02 +02:00
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
baaf131730
Alt pattern for the xion outfit: named xion (yw alt) - Spritefix by whiteout
2020-07-06 19:22:22 -04:00
9fee4f4c7b
Merge pull request #8367 from KillianKirilenko/kk-fixes
...
Update robolimbs_vr.dm
2020-07-06 07:31:53 -04:00
89b1cc659f
Update robolimbs_vr.dm
2020-07-06 08:47:42 +01:00
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
7ad2832f14
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-08 21:49:14 +02:00
6fbbe840fe
Fix defib timer on MMIs
2020-06-05 15:55:08 -04:00
79abbcbc2f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-03 18:30:13 +02:00
619e8b1b94
Ported /tg/ style screen alerts, replacing the hunger icon with them
2020-05-31 11:52:17 -04:00
e45ac4c224
one more fix
2020-05-27 22:44:09 +02:00
be538243c1
various fixes
2020-05-27 22:43:33 +02:00
846c8b7b16
This should all work, but I'm getting unrelated compile errors.
2020-05-27 14:19:30 -04:00
e684df5236
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-21 21:17:58 +02:00
3dabdca3f3
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
2020-05-21 03:20:13 -07:00
3237ae96d7
Merge pull request #7987 from VOREStation/Arokha/talks
...
Talking changes
2020-05-20 16:09:40 -04:00
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
c3e5e6c1f1
Edit Appearance and Change Appearance update icon sex
2020-05-19 21:54:38 -04:00
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
c14d144d45
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-18 16:05:36 +02:00
4bfe8412f4
Tweak math to be faster in ext organs
2020-05-16 22:39:13 -04:00
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
bbb084a354
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 09:06:27 +02:00
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
81ad690b89
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull
2020-05-06 22:36:01 -07:00
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
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
893130bdff
Merge nutrition refactor for vorestation
2020-04-29 18:34:22 -04:00
f1cabd6742
Removes limits on eating, centralizes nutrition changing.
2020-04-29 17:15:15 -04:00
6ebd249748
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
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
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
eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07:00
e89fef965e
QoL: Stasis and Defibs
2020-04-07 00:39:35 -04:00
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
702ccbee5c
Update lungs.dm
2020-03-27 08:39:57 -04:00
c49c1e40f3
Fix runtimes in lungs.dm
2020-03-27 03:18:28 -04:00
34a9cd4561
Fix stupid lung runtime
2020-03-27 00:41:36 -04:00
94f5eda84c
Merge pull request #6967 from VOREStation/upstream-merge-6881
...
[MIRROR] Add mob/living stat setter and observer
2020-03-23 23:25:02 -04:00
87333d9c25
Add mob/living stat setter and observer
2020-03-23 22:47:44 -04:00
1873a3a870
Merge pull request #6880 from Greenjoe12345/teshariprosthetics
...
Teshari prosthetics
2020-03-23 22:38:13 -04:00
9cc3d90ded
Allowing Custom Species access to DSI - Teshari prosthetic limbs.
...
Since Teshari are allowed to be created as a custom race to begin with, I'm not seeing too many issues with this change.
Tested on local and the main thing to note is that the user has to choose Icon Base as Teshari to avoid any weirdness with gear, otherwise works as expected.
2020-03-22 14:07:37 -07:00
487c39eab8
Antag Uplink Expansion
2020-03-17 00:23:20 -04:00
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
91d4e6897a
Prosthetic Expansion: Advent of Species
...
Update robolimbs.dm
Update vorestation.dme
Update prosfab_designs.dm
Fix prosfab_designs.dm
2020-03-14 14:04:06 -04:00
Razgriz