Cadyn
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
ShadowLarkens
637576848e
TGUI PDAs Finale (minus newscaster)
2020-09-16 21:31:50 -07: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
ShadowLarkens
951f37d2e3
TGUI Engineering: Squashed Edition (Commits Below)
...
TGUI APCs
TGUI vending machines
Fix AI default_tgui_interaction
TGUI Airlocks
Station & Atmospheric Alert TGUI + Misc NTOS-TGUI Fixes
TGUI Air Alarms & Central Atmospheric Control
Airlock TGUI
TG... got rid of UI for fire alarm. í´·
TGUI Gas Heating/Cooling System
TGUI Gas Pump & Passive Gate + Fixes
TGUI Omni Atmospherics
TGUI Pipe Dispensers & RPD
TGUI IntelliCore & Vending Fix
TGUI Handheld Tanks
TGUI Portable Pump & Scrubber
TGUI Tank Dispenser & Canisters
TGUI Radios
TGUI SMES & Air Alarm adjustment
Tweak vending machine interfaces a tad
TGUI Algae Farm
TGUI general_air_control
- Distro & Waste Console
- Riot Control Console
- Atmos Intake Console
- Engine Cooling Console
TGUI Heavy Scrubber Control (and body scanner fix)
TGUI trinary devices & shutoff monitor
TGUI Telecomms Log Browser
TGUI Telecomms Machine Browser
TGUI Spaceheater Internal Panel
TGUI Gravity Generator
TGUI Id Cards & Fix ID Card Images
TGUI Id Card Redesign
TGUI Turbolift
TGUI Suit Cycler & Suit Storage Unit & Vending Fixes
TGUI Power Monitor
TGUI Signalers
TGUI Employment Records
TGUI Drone Console
TGUI RIGSuits
TGUI PA & PACMAN, and Margin Fix
TGUI Solar Panels & Fix Power Monitor
Adjust TGUI modules & their interaction with NTOS
TGUI RCON
TGUI Message Monitor
Bump TGUI line limit to 120 (ParadiseSS13/Paradise#14002 )
TGUI Exonet & NTNet Relay
TGUI Telecomms Multitool Menu
TGUI Shield Capacitor & Shield Generator
TGUI Supermatter-everything & Refactors
2020-08-09 04:46:31 -07:00
izac112
601a155b30
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-25 15:22:42 +02:00
ShadowLarkens
3ea0e50432
Port TGUI Wire datums ( ParadiseSS13/Paradise#13769 )
2020-07-22 00:23:58 -07:00
ShadowLarkens
a20eef5bfb
TGUI Camera Console - Part 1; Plain console done
...
# Conflicts:
# code/_onclick/hud/skybox.dm
# code/controllers/subsystems/skybox.dm
# code/game/machinery/computer/camera.dm
# tgui/packages/tgui/public/tgui.bundle.js
2020-07-16 16:17:36 -07:00
izac112
e684df5236
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-21 21:17:58 +02:00
Killian
e248914a3a
Merge branch 'master' into kk-mapfixes
2020-05-19 10:45:35 +01:00
Killian
7e64aa3f1b
mapfix IIIa
2020-05-19 10:04:40 +01: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
Izac Joof Forsgren
42e5d11fb4
Merge branch 'master' into izac-voreupdate
2020-05-18 20:14:49 +02:00
Aronai Sieyes
e3b5d24c8b
Obsolete the PROXMOVE flag and uses
2020-05-18 13:31:54 -04:00
Killian
78f685dae0
fixed: all the other stuff
2020-05-17 08:13:52 +01:00
Killian
5919015d87
fixed: telecomms
2020-05-17 04:02:12 +01:00
izac112
a964a3a1bc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 23:26:52 +02:00
Rykka
3c1c5ab3e4
Port over AI Opening Doors from Paradise
...
This makes an [OPEN] link appear on all radio messages the AI hears (to the right of the follow link). When clicked, it allows the AI to open
the door nearest to the speaker (or, if it is a voice changer, the door
nearest to the poor sap who had his voice stolen).
AI, Open This Door!
2020-05-16 01:56:24 -04: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
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
Leshana
93fb3f7865
Call update procs instead of directly setting idle_power_usage or active_power_usage.
...
- Adds the update_idle_power_usage() and update_active_power_usage() procs for the respective vars.
- Switches all places modifying those vars directly to call the procs instead.
- This will let us react to the change appropriately, paving the way towards static area power.
- Adds update_power_channel proc for the sake of completeness, but no machines actually modify it so far.
2020-04-22 20:47:15 -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
Aronai Sieyes
98dd3707c1
Refactor consoles to operate on logically adjacent zlevels
2020-04-11 12:03:10 -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
d7a9416bb8
Clean up various things
2020-04-03 03:15:06 -04:00
Atermonera
cbb40196fc
Machinery: Always use update_use_power()
2020-03-23 23:21:10 -04: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
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
RadiantFlash7
a60ef71680
exploration cameras
...
Mass camera fixes and holopad fixes!
Also fixes dorm 9.
2019-12-21 16:23:46 -05:00
Atermonera
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
Andrew
e4deaa6478
Combat Mechs Can Punch More Things ( #6303 )
...
* Combat Mechs Can Punch More Things
Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).
Gives punching objects a check so you don't accidently smash something without meaning to.
Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.
* Take_Damage Boogaloo
* More take_damage Stuff
Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.
More stuff can be broken by mech punch and simple mobs.
* Adds changelong
* usr to user
2019-07-24 17:00:24 -04:00
Heroman
37ee44bb55
Updates Tether camera networks
2019-07-10 05:28:48 +10:00
Heroman3003
ca13a8872c
MC camera and access fixes and adjustments ( #6269 )
...
* Adjusts MC camera program, fixes ID program
* Fixes oversight with network access
2019-07-09 14:01:53 -04:00
Neerti
16b3b58259
[REVIEW] Ports Modular Computers from Baystation
2019-04-28 22:06:40 -04:00
Neerti
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Atermonera
fafd85957f
Minor issues fix.
2018-10-06 01:17:19 -04: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
Anewbe
c2794c571d
Hopefully fixes some tool-conversion things
2018-08-03 15:13:29 -05:00
Anewbe
729ce71aa0
Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format
2018-08-02 21:45:15 -05: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
PrismaticGynoid
eabfa03891
Laser pointers ( #5257 )
...
* Laser pointers
Adds laser pointers, ported from tg/oldaurora (but heavily modified). They can be found in the loadout, as well as made by science. Science can also upgrade them, which makes them occasionally useful for blinding people, too.
The bugfixes which make several of the features work properly will come in a separate commit.
* Three fixes
Cats now have resting sprites for all 4 directions, instead of just east. This was needed to make cats look like they're pouncing on the laser dot.
Cameras can now be EMPed more than once, and EMPs actually are able to disable them now. This was needed for the shining lasers into cameras feature.
Flash_eyes() now actually displays a flashing animation on your screen when you get flashed (except for silicons, who for some reason are excluded from this unless EMPed). This was needed for laser pointers to have a temporary "blinding" effect when shone into someone's eyes.
(removes errant debug message too, whoops)
* Nerf
Reduced chances of laser pointers doing anything useful on silicons.
Also, fixes a duplicated proc, oops.
* Requested changes
Minor changes as requested - 'cell' to 'diode', view() to viewers(), range() to viewers().
Stops buckled or dead cats from reacting to laser pointers. Zombie cats are fun, but no.
Also, does another small nerf to the effects on silicons.
2018-05-14 15:22:19 -07:00
Neerti
be73b8c36a
for(var/bad_code in world)
...
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
Leshana
b5cf8383f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
...
# Conflicts:
# code/game/machinery/jukebox.dm
# code/modules/economy/lorenews.dm
# code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
Mechoid
57ab0e715b
Constructs 2.0 - Living Stone ( #5040 )
...
* Construct Overhaul + Related Fixes/Tweaks
2018-04-04 23:45:00 -07:00
Leshana
88c4ca0246
Fix light/camera layers for macros and fix constants for them too.
2018-04-01 16:29:52 -04:00
Leshana
6756c5a483
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
...
# Conflicts:
# .travis.yml
# code/ATMOSPHERICS/components/unary/outlet_injector.dm
# code/__defines/_planes+layers.dm
# code/__defines/chemistry.dm
# code/__defines/mobs.dm
# code/_helpers/mobs.dm
# code/_onclick/hud/robot.dm
# code/game/area/areas.dm
# code/game/machinery/computer/supply.dm
# code/game/machinery/cryopod.dm
# code/game/machinery/doors/airlock.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/devices/communicator/messaging.dm
# code/game/sound.dm
# code/game/supplyshuttle.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/events/event_container.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/language/language.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_powers.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species_shapeshift.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_powers.dm
# code/modules/mob/living/say.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/logout.dm
# code/modules/mob/mob_helpers.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_icon.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_containers/syringes.dm
# code/modules/shuttles/shuttle.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/wildwest.dm
# maps/southern_cross/items/clothing/sc_head.dm
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-03-31 09:20:59 -04:00
Aronai Sieyes
7d3aec96fd
Arranges lots of things into planes ( #5072 )
...
* Rearranges a billion things into planes
* Make cryotubes fancy
* Update Travis
* Fix hiding logic
2018-03-28 12:59:12 -07:00
Leshana
28c193cbdb
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
...
# Conflicts:
# code/game/objects/items/devices/communicator/communicator.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/mob_helpers.dm
# code/unit_tests/zas_tests.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-04 22:44:04 -05:00