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
Tad Hardesty
927050ce44
Fix various syntactic problems
2018-05-16 21:43:18 -07:00
Anewbe and GitHub
1a29f5f009
Merge pull request #5264 from VOREStation/pol-ssao-ex
...
SSAO object excludes
2018-05-16 19:28:39 -05:00
PrismaticGynoid and Atermonera
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
Arokha Sieyes
bdfa34c911
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:54:10 -04:00
Arokha Sieyes
91f0c05a4b
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:38:22 -04:00
Atermonera and GitHub
2a16467f8a
Merge pull request #5219 from VOREStation/vplk-nanoui-multi-template
...
NanoUI multiple templates example.
2018-05-03 11:12:56 -07:00
Atermonera and GitHub
c3ac0870b6
Merge pull request #5235 from VOREStation/pol-vs-3611
...
Fix wonky PDA eject messages
2018-05-01 13:01:26 -07:00
Arokha Sieyes
ce5c7619b9
Fix wonky PDA eject messages
...
As reported in https://github.com/VOREStation/VOREStation/issues/3611 , attempting to eject a cart on a PDA when there's no cart tells you that you can't do that while you're restrained, which isn't very explanatory.
2018-04-30 15:39:48 -04: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
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
Arokha Sieyes
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# 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-7.dmm
# maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
Leshana
218c17d268
Ported laser pointer. It lets you point at stuff with lasers.
2018-04-24 12:59:27 -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
Heroman3003
d63e611554
Fixed closet painter making non-closet 'closets' invisible
2018-04-12 21:47:43 +10:00
Mechoid and Atermonera
57ab0e715b
Constructs 2.0 - Living Stone ( #5040 )
...
* Construct Overhaul + Related Fixes/Tweaks
2018-04-04 23:45:00 -07: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 and Leshana
cad8df658e
POLARIS: Communicator small refactor
2018-03-21 14:30:43 -04:00
Neerti and GitHub
70ac478aea
Merge pull request #5065 from VOREStation/vs-port-3204
...
[PORT] Revamp logging for consistency
2018-03-20 21:13:47 -04:00
Aronai Sieyes and GitHub
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
Anewbe
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
Arokha Sieyes and Leshana
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
Atermonera and GitHub
cb37f7d36c
Ater missed another <br>
2018-03-11 19:26:08 -07:00
Anewbe and GitHub
9f56416684
Merge pull request #5037 from VOREStation/aro-updateicons
...
Rewrite human/update_icons()
2018-03-11 21:03:10 -05:00
Cerebulon and Anewbe
b7090d7df2
Adds Tajaran Akhani language. ( #5032 )
...
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.
* Gives the language a colour distinct from Siik.
* Changelog
2018-03-11 16:55:08 -05:00
Mewchild
e129f03b42
Gives RD explorer comms
2018-03-10 16:52:52 -06:00
Arokha Sieyes
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
Arokha Sieyes
53a185f838
U_I Phase 2.0: Code cleanup
...
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
2018-03-08 19:33:44 -05:00
Arokha Sieyes
aa9ec19118
U_I Phase 1.0: First consolidation pass
2018-03-08 19:31:43 -05:00
Atermonera and GitHub
6402538f3c
Weather reports won't crash when planet controller dies
2018-03-04 15:41:55 -08:00
Arokha Sieyes
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
Anewbe and Atermonera
524c9aa5db
Removes translators from the loadout ( #4942 )
2018-03-01 12:00:37 -08:00
Anewbe and GitHub
ee9061e80f
Merge pull request #4982 from Cyantime/tinypda
...
Fixes two minor PDA cart issues.
2018-03-01 11:09:26 -06:00
Anewbe and GitHub
dda4b68e4d
Merge pull request #4981 from VOREStation/pol-radio-drama
...
Adds 'Intercom Convo' verb
2018-03-01 10:32:30 -06:00
Atermonera and GitHub
dfe41e3250
Made a <br> into a <brr>
2018-02-27 21:42:41 -08:00
Cyantime
ec5f2543d7
Fixes two minor PDA cart issues.
2018-02-27 22:45:09 -05:00
Arokha Sieyes
43065846a4
Adds 'Intercom Convo' verb
...
Allows an admin to 'schedule' up to 20 messages to play on the radio.
2018-02-27 21:24:22 -05:00
Arokha Sieyes
7aa5ca479a
Adds 'Intercom Convo' verb
...
Allows an admin to 'schedule' up to 20 messages to play on the radio.
2018-02-27 21:17:47 -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
Atermonera and Anewbe
4e9a1a0fba
Unobfuscates GPS locations ( #4910 )
...
* Makes GPS units more useful, adds helper to give more useful dir strings
* Re-obfuscates PoI gps locations
They keep adir direction though, so finding them should generally be easier
* Re-obfuscates PoI gps locations
2018-02-22 22:10:18 -06:00
Atermonera and Anewbe
410aca398e
Adds halogen counter tool, adds gas scanner to analyzers ( #4903 )
...
* Adds halogen counter tool, adds gas scanner to analyzers
* Appeases travis
* Missed a tag
2018-02-22 15:01:25 -06:00
Anewbe and GitHub
c06fe44755
Merge pull request #4907 from VOREStation/pol-spybugs
...
Make spy bugs spawn spy cameras
2018-02-21 22:40:03 -06:00
Anewbe and GitHub
dfdafddaa9
Merge pull request #4897 from VOREStation/pol-analfix
...
Fix health analyzer names
2018-02-21 10:03:09 -06:00
Anewbe and GitHub
a6653bf00a
Merge pull request #4896 from VOREStation/pol-qdels
...
Fix several Destoy()s
2018-02-21 10:01:23 -06:00
Arokha Sieyes
20c145aafc
Make spy bugs spawn spy cameras
...
They are just using New() from their parent which spawned a normal camera. Now they store a type.
2018-02-20 23:29:59 -05:00
Arokha Sieyes
3fdafb7194
Rename medical scanners and update map
2018-02-20 19:25:31 -05:00
Anewbe and Atermonera
25a1f47a30
Headset sprites, planetside headset functionality ( #4869 )
2018-02-20 12:36:22 -08:00
Arokha Sieyes
0c0f09fe68
POLARIS: Fix several Destroy()s
2018-02-20 10:00:23 -05:00
Arokha Sieyes