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
b60281e19a
Revert "Nanoui now supports use of multiple templates ( #5105 )"
...
This reverts commit a2841ce9d6
2018-04-27 11:36:03 -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
Atermonera
a2841ce9d6
Nanoui now supports use of multiple templates ( #5105 )
...
* Nanoui now supports use of multiple templates
* Removing debug code, indentation
* Indentation
2018-03-28 14:53:50 -05:00
Leshana
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
Abbie Fland
47b45eb1f8
Fixed pAI communicator buttons.
...
While pAI could open their communicator, they were unable to interact
with any of the buttons in its UI. This adds the UI of their own
built-in communicator to the other two UIs they were already explicitly
allowed to access (those of their own radio and their own interface).
2018-02-22 03:17:03 +00: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
Anewbe
416cb98b53
Removes testing code. ( #4871 )
2018-02-18 11:43:42 -08:00
Arokha Sieyes
9d9d735b99
Remove misplaced debug statement
2018-02-18 00:44:02 -06:00
Arokha Sieyes
5967bb6dc5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/weapons/storage/boxes.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/modules/mob/living/carbon/human/species/species.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
Anewbe
09f7f798d3
Power monitoring consoles find all station-related sensors ( #4853 )
2018-02-17 20:40:32 -08:00
Leshana
7ed3d2c2f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
...
# Conflicts:
# code/_onclick/hud/screen_objects.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/modules/admin/admin_verbs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/gloves/color.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/simple_animal/aliens/alien.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/goose.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_defines.dm
# code/modules/projectiles/projectile/special.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-7.dmm
# vorestation.dme
2018-02-17 00:35:29 -05:00
Cyantime
b0b821cb71
Adds hidden alarms, for air alarms, fire alarms, and APCs ( #4816 )
...
* Adds hidden alarms
* TRUE/FALSE defines
* Renames var to alarms_hidden
2018-02-16 12:50:06 -06:00
Arokha Sieyes
08e7703e4f
Finishing Up NIFs
...
Squashed commit:
[4b18ca1] Finishing up NIFs
[e4adb4a] Tons more NIF work
All the implants are done!
2017-06-06 19:34:41 -04:00
Leshana
5f5ea3ea3b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
...
# Conflicts:
# code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
# code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
# code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
# code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
# code/game/machinery/computer/Operating.dm
# code/game/machinery/computer/camera.dm
# code/game/machinery/computer/communications.dm
# code/game/machinery/computer/security.dm
# code/game/machinery/computer/skills.dm
# code/game/objects/items/devices/radio/jammer.dm
# html/changelogs/.all_changelog.yml
# maps/~map_system/maps.dm
# nano/images/nanomap_z1.png
# nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Leshana
d41f6cce04
Ensure computers work on centcom or when only one zlevel is accessible.
2017-05-22 16:18:26 -04:00
Leshana
b4ca6b11e1
Switch nanomap computers over to using get_sensor_levels()
...
* Added a proc to the map datum which returns what zlevels a nanomap capable computer should display.
* Updated the atmos control, power monitoring, crew monitoring, and camera consoles to use it.
* Changed templates to not show the map button if no map levels are available.
2017-05-22 16:18:26 -04:00
Leshana
e16a3f4b3d
Updated crew monitor computer to support multi-z output and nanomaps.
2017-05-22 16:15:47 -04:00
Leshana
fbb1a75438
Enabled multi-z nanomap in nanoui on power monitor, sec camera, and armos computers.
2017-05-22 16:15:47 -04:00
Leshana
b89897e8a2
Enhances power monitor computers to use the nano-map to show APC locations.
...
* In addition to showing APCs on a sensor'd powernet, the same APCs can be shown on the nano-ui map!
* Hover tooltip shows basic information on the APCs.
* Makes it easier to spacially understand where APCs are when you send people out to work on them.
2017-05-22 16:15:47 -04:00
Leshana
388d6785ec
Add nanomap to the Atmos Control Computer
...
* In addition to showing a list of air alarms, the atmos computer now shows them as pins on the nanomap.
* Since the atmos computer shows all z-levels, the nanomap will be mutli-z. Limited to station levels of course.
2017-05-22 16:15:47 -04:00
Leshana
93495bd53e
Switch nanomap computers over to using get_sensor_levels()
...
* Added a proc to the map datum which returns what zlevels a nanomap capable computer should display.
* Updated the atmos control, power monitoring, crew monitoring, and camera consoles to use it.
* Changed templates to not show the map button if no map levels are available.
* Overrode it for tether to let crew monitoring computers monitor the whole station.
2017-05-21 22:03:18 -04:00
Leshana
0f593fe087
Updated crew monitor computer to support multi-z output and nanomaps.
2017-05-17 00:59:10 -04:00
Leshana
8d1ea8c138
Enabled multi-z nanomap in nanoui on power monitor, sec camera, and armos computers.
2017-05-17 00:58:21 -04:00
Leshana
93f309b358
Updated nanomaps for tether map.
...
* Generated the tether nanoui maps.
* Had to update the nanomap generator and nanoui CSS to account for our smaller maxx and maxy
2017-05-16 20:55:26 -04:00
Arokha Sieyes
465446be25
Merge pull request #1187 from VOREStation/apc-map
...
Enhances power monitor computers to use the nano-map to show APC locations.
2017-03-15 22:55:10 -04:00
Leshana
a30406c2ee
Add nanomap to the Atmos Control Computer
...
* In addition to showing a list of air alarms, the atmos computer now shows them as pins on the nanomap.
* Since the atmos computer shows all z-levels, the nanomap will be mutli-z. Limited to station levels of course.
2017-03-14 22:44:12 -04:00
Leshana
356e96b421
Enhances power monitor computers to use the nano-map to show APC locations.
...
* In addition to showing APCs on a sensor'd powernet, the same APCs can be shown on the nano-ui map!
* Hover tooltip shows basic information on the APCs.
* Makes it easier to spacially understand where APCs are when you send people out to work on them.
2017-03-13 20:50:30 -04:00
Arokha Sieyes
ce01659ae1
Adds a console to medical, engineering, security AR glasses
...
Crew monitor, alerts console, other alerts console
2017-03-06 00:33:08 -05:00
Neerti
12abb2d6f2
Ports a large chunk of the map datum system that europa/bay uses.
...
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Yoshax
760d5c3b54
Fixes #2258
2016-10-07 04:30:29 +01:00
SinTwo
eabefc538a
Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"
...
This reverts commit 6bb5409349f6a83d5ee0
2016-08-15 12:58:00 -04:00
SinTwo
fe46fac5cc
final new NanoUI fixes and tgui port
2016-07-27 23:01:26 -04:00
SinTwo
4fa126b7e7
a whole lot of nanoui upgrades
2016-06-24 00:43:16 -04:00
Yoshax
f75d509e7f
Ports event system from Bay
2016-06-01 22:05:04 +01:00
SinTwo
a87c8de3fd
HTML5 and CSS3 ( #1677 )
...
* Updates to HTML5 and CSS3
* UI Tweaks and Fixes
2016-05-19 14:28:38 -04:00
Leshana
e0a77f7d2f
Fix the letter ÿ in nano-ui displays
...
* Particularly noticable on the cartridge button of the PDA, any time we transmit a name containing \improper or \proper using nanoui it shows up as ÿ
* This is becuase BYOND internally handles these escapes by simply using character 0xFF etc.
* We'd better strip them out before sending them as JSON data so they aren't rendered as ÿ when treated as utf-8 encoding.
2016-05-14 23:26:15 -04:00
Datraen
44edf86ccb
Merge pull request #1455 from Yoshax/gendertweak
...
Gender tweaks and adjustments
2016-05-05 10:18:25 -04:00
Hubblenaut
8e52273e20
RCON Interface Update ( #1545 )
...
* SMES interface charging fix
* Updates RCON console to use kW units
2016-05-04 15:35:12 +01:00
Yoshax
7be9dd4b14
Adds ability for FBPs to select neuter as a gender when changing gender using the appearance changer
2016-04-27 14:52:55 +01:00
Yoshax
aa592e3b35
Gender tweaking
...
Limits biolgical gender by species and defaults to male/female.
Can also set gender identity which determines which is displayed upon examination and suchlike along with being shown in medical records
2016-04-20 20:07:14 +01:00
Yoshax
0577738032
Character setup gender selection changes
...
Different species now have different gender selections available.
2016-04-20 16:27:55 +01:00
Jon
3c85fe3e65
Updates NanoUI map.
...
Also should update the necessary files so you don't need to alter nanomapgen.dm to fit our map.
I don't know why I didn't just commit this the first time. Call me dumb.
2016-03-30 15:02:42 +01:00
Datraen
996ce92f7f
Merge pull request #1184 from Yoshax/510prep
...
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Datraen
fe9d3fd4c4
Merge pull request #1027 from Kelenius/mobCleanup
...
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
Datraen
1b40fb3bfe
Traitor Borg lockdown, blowing-up fixed; can now self-hack.
2016-03-12 17:03:28 -05:00
Kelenius
acc78a8000
Changes types of ghosts and eyes
...
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``
Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Neerti
f219980a3d
Fixed merge conflicts causing lack of compilation hopefully.
2015-12-07 03:38:38 -05:00
