izac112
19e46d19b2
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-17 01:06:24 +01:00
Runa Dacino
e3f3e416b8
adds: gm tool for creating prop pdas convo for events
...
* Creates new proc in pda/messenger.dm to handle fake conversation creation
* Creates new eventkit datum and holder var on client for remembering identitities
* Creates new proc as eventkit R_FUN verb for managing prop identities
* Creates new proc on pda to create a fake event prop conversation in new eventkit
* Creates new topic in admin/view_variables/topic.dm and helper.dm to call new proc on pda
2024-02-08 16:08:18 +01:00
izac112
eddb283c11
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-18 03:17:20 +01:00
Selis and GitHub
7ccdbb258f
Revert "Revert "12/10/23 - Map swap update" ( #15593 )" ( #15594 )
...
This reverts commit f00d13da66 .
2023-12-11 00:22:42 +01:00
Selis and GitHub
f00d13da66
Revert "12/10/23 - Map swap update" ( #15593 )
2023-12-10 23:37:45 +01:00
ItsSelis
09b3d544ca
Misc adds and changes
2023-12-08 17:25:54 +01:00
izac112
5052f6f672
Merge branch 'release' of https://github.com/VOREStation/VOREStation ; branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac
2023-11-28 16:48:53 +01:00
Selis
ae70205eae
tgchat part 1
2023-11-20 13:58:41 +01:00
izac112
ff7df50a7e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-06-21 19:03:35 +02:00
Runa Dacino
6c2ee4a4ce
Adds a set of new admin verbs for narrating (obj &mob)
...
*Adds verbs to client: Narrate Entity, ... (Add ref), ... (Remove ref), ... (Interface)
* Adds new Client var to hold reference to entity_narrate datum instance
*Creates entity_narrate datum to hold list of unique/custom entity names, and an assoc list of name:atomref
* All listed client verbs initialize the datum onto the client var for later use when first used
* User is expected to right click mobs within viewrange to add them to ref list
* User is prompted to create a unique identifier to generate the key:value pair
* User may either request an interface to do the narration (interface)
* User may alternatively go narrate-mob "identifier" "speak/emote" "narration" into command line
* In case of argument call, message may be ommited to bring up non-multiline tgui_input_text
* User may remove entities from their personal list at will
* Users adding entities to their personal list are logged
* Users attempting to add players to their personal list are likewise logged
* Users succeeding despite this are logged if they try to speak for them
* If type is mob/living, it uses .say and .custom_emote() procs
* .say uses the mob's languages, stutters and so forth
* if type is obj/, user must specific speech verb when composing narration.
* User may narrate from any range.
* Each proc checks for R_FUN permission and prevents using if lacking rights
2023-06-01 17:41:37 +02:00
izac112
8f96195fdb
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-07-23 13:40:54 +02:00
ItsSelis
e9e03a4483
Fullscreen & Cross Origin
2022-07-16 15:04:12 +02:00
izac112
dd8893112f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-07-08 09:40:23 +02:00
Leshana
821cd519e3
Add code to use SSInput with cardinal-only movement behind a compile flag.
2021-07-06 20:37:20 -04:00
Leshana
0acd01049c
Implement SSInput subsystem and Diagonal Movement
...
- SSInput subsystem for running movement inside the tick.
- Switch skin.dmf to use KeyUp/KeyDown procs for movement keys.
- Logic to do responsive diagonal movement.
2021-07-06 20:37:19 -04:00
izac112
707ee519cf
Turns macros on again after 5 years.
2021-06-27 11:42:58 +02:00
izac112
cb882173a1
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-05-31 02:28:47 +02:00
Aronai Sieyes
44399bf7f5
Suggested changes, small opts
2021-05-30 17:20:09 -04:00
Aronai Sieyes
ea42ee2303
Port Runechat
2021-05-30 15:45:11 -04:00
izac112
9c6581fe6c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-03-11 17:36:42 +01:00
Cerebulon and VirgoBot
0665d37c78
Lobby Improvements
2021-02-21 16:33:23 -05:00
izac112
48af4c881c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-22 20:07:45 +02:00
ShadowLarkens and Rykka
7aaa40b62c
Beginnings of a global volume control system
2020-08-21 04:42:47 -04:00
izac112
601a155b30
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-25 15:22:42 +02:00
ShadowLarkens
126cc6b5da
Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc.
2020-07-19 20:46:12 -07:00
izac112
4864ad384d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-17 04:30:06 +02:00
Arokha Sieyes
f1854f89b9
Add more safety around the hours query
2020-06-13 23:07:12 -04: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
ea8a068025
Add department playtime requirement config, code
2020-05-08 17:57:56 -04:00
Atermonera and VirgoBot
ee07d117f2
Adds preference to control multilingual behaviour
2020-05-08 00:43:57 -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
99fa98f437
Get your clicks out of my movement code
2020-04-30 15:40:41 -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
Atermonera and VirgoBot
a85b953ef4
Adds preference to output description_info with examine text ( #6969 )
...
* Adds preference to output description_info with examine text
* includes the defines file
2020-04-10 01:21:21 -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
Arokha Sieyes and Leshana
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
izac112
933385020f
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
...
# Conflicts:
# code/modules/mining/machine_stacking.dm
# Resolved
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm # Resolved mostly besides line 717 "plasteel: undefined var"
# even though the only change in this line is removing the comment
# icons/mob/widerobot_vr.dmi
# Resolved
# maps/tether/tether-07-station3.dmm
# Resolved
2020-01-31 18:23:50 +01:00
Aronai Sieyes
e67419d8cc
IP reputation checking
2020-01-15 14:30:41 -05:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Atermonera and VirgoBot
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Hawk_v3
10ca5bb70f
Merge remote-tracking branch 'upstream/master'
2018-10-14 17:09:41 +01:00
Anewbe and VirgoBot
e4660c5838
Admin ticket system (for real this time)
2018-10-09 16:31:01 -04:00
Hawk_v3
beb7579ed3
Vore Updates and merges
2018-10-03 18:25:39 +01:00
Arokha Sieyes
b099ac6e4c
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
...
# Conflicts:
# code/__defines/holomap.dm
# code/__defines/mobs.dm
# code/_helpers/icons.dm
# code/_helpers/unsorted.dm
# code/_onclick/hud/hud.dm
# code/_onclick/item_attack.dm
# code/controllers/Processes/supply.dm
# code/controllers/subsystems/planets.dm
# code/datums/supplypacks/munitions.dm
# code/datums/supplypacks/science.dm
# code/datums/supplypacks/security.dm
# code/datums/supplypacks/supply.dm
# code/game/area/Space Station 13 areas.dm
# code/game/atoms_movable.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/door.dm
# code/game/machinery/jukebox.dm
# code/game/machinery/recharger.dm
# code/game/machinery/vending.dm
# code/game/mecha/equipment/tools/medical_tools.dm
# code/game/mecha/equipment/weapons/weapons.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/megaphone.dm
# code/game/objects/items/poi_items.dm
# code/game/objects/items/weapons/implants/implantlanguage.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/objects/structures/flora/trees.dm
# code/game/objects/structures/plasticflaps.dm
# code/game/supplyshuttle.dm
# code/game/turfs/simulated/wall_attacks.dm
# code/modules/admin/admin_verbs.dm
# code/modules/assembly/infrared.dm
# code/modules/client/client procs.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/client/preferences.dm
# code/modules/clothing/suits/miscellaneous.dm
# code/modules/holomap/holomap_datum.dm
# code/modules/holomap/station_holomap.dm
# code/modules/integrated_electronics/core/printer.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/death.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/robot.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob_movement.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/subtypes/standard.dm
# code/modules/planet/weather.dm
# code/modules/power/cable.dm
# code/modules/power/fusion/core/core_control.dm
# code/modules/power/fusion/fuel_assembly/fuel_control.dm
# code/modules/power/fusion/gyrotron/gyrotron_control.dm
# code/modules/projectiles/gun.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# config/names/first_name_skrell.txt
# config/names/last_name_skrell.txt
# icons/mob/head.dmi
# icons/mob/robots.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/obj/ammo.dmi
# icons/obj/gun.dmi
# icons/obj/mining.dmi
# icons/obj/projectiles.dmi
# icons/obj/rig_modules.dmi
# icons/obj/surgery.dmi
# icons/turf/walls.dmi
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-8.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
# maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
# maps/submaps/surface_submaps/mountains/deadspy.dmm
# maps/submaps/surface_submaps/mountains/mountains_areas.dm
# maps/submaps/surface_submaps/plains/Thiefc.dmm
# maps/~map_system/maps.dm
# vorestation.dme
2018-09-27 18:01:09 -04:00
Neerti and Anewbe
3de28fa6b2
Ambience Refactor ( #5476 )
...
* Refactors how ambience is assigned, removes bad ambience, ports good ambience from tg
* Apparently that file is still used, not worth the salt to remove it.
* Changelog
2018-08-06 11:12:17 -05:00
Repede
b83e867682
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
# code/modules/power/lighting.dm
2018-06-02 18:33:44 -04:00
Arokha Sieyes
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
Arokha Sieyes
6b4be2d7a8
Paranoid logging and byond account age
...
Adds the PARANOIA_LOGGING setting to config.txt (and PANIC_BUNKER which was missing for some reason) and updates example.
PARANOIA_LOGGING (also available as a verb for admins in Server) begins notifying admins of any 0day byond accounts, or users who have never joined before. For when you don't quite want to panic bunker.
Also makes this information available in player panel. Requires SQL connection.
2018-05-22 23:03:53 -04:00
Arokha Sieyes and Leshana
de6da4a86c
POLARIS: Tooltip framework, and mob tooltips
2018-03-20 22:42:16 -04:00
Repede
26d570b470
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/multiz/pipes.dm
# config/custom_items.txt
2018-03-14 18:23:53 -04:00