Commit Graph

631 Commits

Author SHA1 Message Date
Verkister 2e68ca894d Merge pull request #9265 from Detective-Google/pixel-shift
Ports Pixel shifting.
2020-10-31 19:37:42 +00:00
Razgriz b40ad0a24e Update mob.dm 2020-10-19 18:06:04 -07:00
Cadyn 07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Atermonera 367a8501ac /atom/visible_message respects exclude_mobs (#7665) 2020-09-18 23:34:38 -04:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Novacat 25058122bf Merge pull request #8826 from VOREStation/upstream-merge-7555
[MIRROR] Actually adds (and TESTS) exclude_mobs parameter to visible_message
2020-08-28 13:02:03 -04:00
Novacat 33b1eb1cdb Update mob.dm 2020-08-28 12:38:16 -04:00
ShadowLarkens 0c2c82fe5f TGUI Drag Inventory 2020-08-25 21:56:51 -07:00
Atermonera fbf39daacf Actually adds (and TESTS) exclude_mobs parameter to visible_message 2020-08-25 00:31:12 -04:00
izac112 5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Atermonera a1292af9c3 Merge pull request #7462 from listerla/pulling
Adds audio and visual feedback to pulling.
2020-08-12 14:47:32 -04:00
SplinterGP 9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00
izac112 22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
Atermonera 736fdab6e3 Merge pull request #7273 from Cyantime/obs
Observing improvements
2020-06-24 11:36:18 -04:00
izac112 7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
Atermonera affd284004 Add AI Picture-in-Picture Mode! 2020-06-03 10:09:30 -04:00
izac112 e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes 86373ecc96 Merge pull request #8050 from VOREStation/Arokha/furtherghost
Redo respawning
2020-05-25 11:37:51 -04:00
Atermonera 0d1443b06f Grab movement sped up (#7223)
Wheelchairs are less hilariously buggy
2020-05-24 17:25:48 -04:00
Aronai Sieyes 49b9896f73 Redo respawning 2020-05-23 17:32:02 -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 0bad4363b8 Sleep AI processing when nobody on their Zlevel 2020-05-17 10:00:45 -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
izac112 2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Rykka 3b3a7b960c Add Picture-in-Picture Mode for AI's, Working on Resolving Runtime
WIP DESC
2020-05-10 12:31:49 -04:00
Aronai Sieyes b2fa5ec136 Move all mob movement cooldowns into one proc 2020-05-06 20:27:22 -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
Aronai Sieyes 0b18d17a07 Further tweak smooth movement 2020-05-02 19:20:54 -04:00
Aronai Sieyes f5cbd8c35e Stop adjusting cooldown directly 2020-04-30 15:43:58 -04:00
Aronai Sieyes 311c4e35df Clean up last_area garbo 2020-04-30 15:42:55 -04:00
Aronai Sieyes 99fa98f437 Get your clicks out of my movement code 2020-04-30 15:40:41 -04:00
Aronai Sieyes 6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
ShadowLarkens 139d5cd3c3 Saycode Overhaul -- Multilingualism 2020-04-20 04:12:53 -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
Leshana 3be0330db2 Remove the goonstation /datum/controller/processScheduler as it is no longer used. 2020-04-14 16:17:32 -04:00
Repede 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
Atermonera 4f50c50452 Merge pull request #6928 from VOREStation/pol-runtimes
Fix 2 runtimes
2020-04-01 22:39:14 -04:00
Aronai Sieyes 9917826c85 Merge pull request #6965 from VOREStation/aro-fighters
Creates 2 new mech equipments and space fighters
2020-03-24 14:04:42 -04:00
Atermonera 87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
Aronai Sieyes c93c5afefa Adds atom/movable cloaking framework 2020-03-23 21:34:32 -04:00
Aronai Sieyes 13f181beda Merge pull request #6862 from VOREStation/vplk-zoomy-skybox
Scale Skybox by client view size
2020-03-16 10:01:50 -04:00
Leshana 73c4809d26 Add proc set_viewsize() to allow hooking actions when client.view is changed.
- Proc is on mob to simplify the standard use case; maybe someday actually save it there too if desired.
2020-03-15 17:59:17 -04:00
Atermonera cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04:00
Repede c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
2020-03-01 12:35:52 -05:00
Repede 4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
ShadowLarkens 22c85075f4 Ported tg asset cache 2020-02-19 19:55:01 -05:00
Arokha Sieyes d5b820fc58 VChat: Redone chat output in Vue.js
Co-authored-by: Leshana <Leshana@users.noreply.github.com>
2020-02-19 19:55:01 -05:00
Arokha Sieyes 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Hawk_v3 838f5e9418 Merge remote-tracking branch 'upstream/master' 2020-01-06 00:47:53 +00:00