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
Leshana
f508841fff
Refactor common template HTML for atmospheric scan into its own file.
...
As a demonstration of the partials inclusion feature, the HTML for the atmospheric scan screen (which was nearly identical between PDAs and Communicators) was moved into a separate file and then transcluded into both pda.tmpl and communicator.tmpl
Also added a README.dm with the very basics of nanoui and template transclusion, and fixed comments in nano_state.js
2018-04-27 14:42:42 -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
Arokha Sieyes
cad8df658e
POLARIS: Communicator small refactor
2018-03-21 14:30:43 -04:00
Aronai Sieyes
961f2934c4
Merge pull request #3242 from VOREStation/aro-commfactor
...
Communicator + NIF Refactor
2018-03-16 20:34:21 -04:00
Arokha Sieyes
020c2a06f1
POLARIS: Communicator small refactor
2018-03-15 23:47:00 -04:00
Leshana
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
Arokha Sieyes
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
Arokha Sieyes
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
Atermonera
6402538f3c
Weather reports won't crash when planet controller dies
2018-03-04 15:41:55 -08:00
Arokha Sieyes
0c0f09fe68
POLARIS: Fix several Destroy()s
2018-02-20 10:00:23 -05:00
Arokha Sieyes
a75cfe0eb1
POLARIS: Fix several Destroy()s
2018-02-20 00:20:46 -05:00
Leshana
1d0f5262d8
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
...
# Conflicts:
# code/__defines/subsystems.dm
# code/controllers/master_controller.dm
# code/controllers/subsystems/atoms.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/vr_console.dm
# code/game/objects/items/devices/communicator/phone.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin_verbs.dm
# code/modules/mob/living/carbon/carbon.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/gun.dm
# code/modules/shuttles/shuttle.dm
# code/modules/shuttles/shuttles_web.dm
# icons/obj/doors/doormed.dmi
# maps/southern_cross/items/headset_sc.dm
# maps/southern_cross/southern_cross-3.dmm
# vorestation.dme
2018-02-07 19:30:50 -05:00
elgeonmb
b0fd486e27
moves us out of kara, pt 2
2018-02-05 23:22:45 -08:00
Arokha Sieyes
3c5e6d620a
Adds generic can_telecomm proc
2018-02-02 17:59:04 -05:00
Arokha Sieyes
04c8942bf7
POLARIS: can_telecomm() proc
...
Attempts to discover if two parties can talk to each other using telecomms, and as a PoC applies it to communicators which attempt to get to their node via the can_telecomm proc.
2018-02-02 16:13:31 -05:00
Leshana
612a75cb49
Prevent communicators from connecting to the exonet when off station.
2018-01-31 21:02:22 -05:00
Leshana
3c3dac7102
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
...
# Conflicts:
# code/_onclick/hud/hud.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/mob/living/carbon/human/update_icons.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-19 17:52:25 -05:00
BillyBangles
c44af58716
Adds communicator watch (take 2) ( #4406 )
...
* adds communicator watch
* adds commwatch to a loadout selection list
* adds changelog
just in case
2018-01-17 19:33:32 -06:00
Arokha Sieyes
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Atermonera
30352e1c9b
"Communicators have a flashlight" ( #4523 )
2018-01-13 21:49:58 -06:00
atermonera
b7f7f6868a
Revert "Communicators have a flashlight"
...
This reverts commit 3db1efc5aa
2018-01-12 15:24:15 -08:00
atermonera
3db1efc5aa
Communicators have a flashlight
2018-01-12 15:19:02 -08:00
Leshana
807f1c7b4b
Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
...
# Conflicts:
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
Atermonera
132e20ba52
Nanoui rounding
2018-01-05 23:04:55 -08:00
Arokha Sieyes
f0023b5c9a
Commlink QoL
...
Makes it properly auto-register your name instead of coming as Unset every time.
Makes messages to Commlinks properly stay in the commlink user's head.
2018-01-05 17:57:39 -05: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
Atermonera
e004d1c4ec
Weather app has atmospheric scan
2018-01-01 23:43:24 -08:00
Atermonera
7870ee529c
Adds a weather app to the communicator
...
Splits communicator.dm into multiple files
Also a few bits from my PDA->communicator project, should be commented out
2017-12-28 21:33:23 -08:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Cyantime
209b354fd4
Allows communicators to be made by RnD, shows ghosts communicator IMs
2017-11-27 00:33:49 -05:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
elgeonmb
36fa36586a
fixed double periods when ghost-texting
2017-10-16 19:41:30 -07:00
killer653
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
Neerti
9a08825681
Receiving Communicator messages and voice requests as a ghost now plays sounds to the ghost, which may help them notice in their chatlog.
2017-07-07 01:01:48 -04:00
Leshana
4b46703d9d
A plethora of Destroy() fixes - return qdel hints and clean stuff up.
2017-06-14 01:07:35 -04:00
Leshana
cae4b3f12c
A plethora of Destroy() fixes - return qdel hints and clean stuff up.
2017-06-11 23:48:17 -04:00
Leshana
5a02b7e5c7
More and more Destroy() cleanups all across the board - Return qdel hints.
2017-06-10 22:41:51 -04:00
Anewbe
5d81148ab8
Merge pull request #3511 from VOREStation/garbage-subsystem
...
tg Garbage Subsystem
2017-06-10 17:20:22 -05:00
Arokha Sieyes
ade7f6c1cd
Communicator QOL Tweak
...
Call/Msg buttons on contacts list
2017-06-06 01:03:08 -04:00
Arokha Sieyes
34f60eb07b
Communicator QOL Tweak
...
Call/Msg buttons on contacts list
2017-06-06 01:00:47 -04:00
Leshana
e48b548f2b
More and more Destroy() cleanups all across the board - Return qdel hints.
2017-06-05 23:01:41 -04:00
Arokha Sieyes
5d73d45461
Merge pull request #1481 from VOREStation/aro-jammer
...
Subspace jammer item
2017-05-17 20:47:32 -04:00
Arokha Sieyes
5c7ef1bbef
Subspace jammer item
...
Jams the three devices that I'm aware of that use subspace communications: Headsets, PDAs, and Communicators.
All three will be unable to communicate if in range of a jammer. The default range is 7 turfs, the battery that comes in the jammer is a weapon cell (just to make it a little harder to find replacements) and lasts 60 seconds. The range and power use are variables.
Speaking through a headset will produce 'soft' or 'loud' static depending on how far you are, allowing you to sort of dead-reckon your way to a placed jammer. You can just carry them, otherwise.
I've got no experience with adding tator items so I'll leave that sort of thing up to you guys.
2017-05-09 20:13:43 -04:00
Arokha Sieyes
6e21e1ad28
Subspace jammer item
...
Jams the three devices that I'm aware of that use subspace communications: Headsets, PDAs, and Communicators.
All three will be unable to communicate if in range of a jammer. The default range is 7 turfs, the battery that comes in the jammer is a weapon cell (just to make it a little harder to find replacements) and lasts 60 seconds. The range and power use are variables.
Speaking through a headset will produce 'soft' or 'loud' static depending on how far you are, allowing you to sort of dead-reckon your way to a placed jammer. You can just carry them, otherwise.
I've got no experience with adding tator items so I'll leave that sort of thing up to you guys.
2017-05-09 20:11:23 -04:00
Leshana
4fbfa7ee37
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
...
# Conflicts:
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/mob_defines.dm
# html/changelogs/.all_changelog.yml
# vorestation.dme
2017-05-08 21:07:45 -04:00
LorenLuke
ee5e011c6c
Can view active video calls that you camera'd out of.
2017-04-30 14:39:08 -07:00
Arokha Sieyes
e01278a72f
Communicator fixes
2017-04-06 18:08:13 -04:00
Arokha Sieyes
be9bcf81f0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-03-21 11:22:29 -04:00
Anewbe
c65588b099
Communicator QoL
2017-03-21 00:51:26 -05:00
