Commit Graph

164 Commits

Author SHA1 Message Date
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 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
Arokha Sieyes e14857b169 POLARIS: Ventcrawling assistance 2018-03-25 17:07:54 -04:00
Arokha Sieyes 737abb9227 POLARIS: Ventcrawling assistance 2018-03-19 23:01:00 -04:00
Atermonera 09a945a3af Merge pull request #5027 from Verkister/borghud
Couple borg UI fixes.
2018-03-16 11:24:43 -07: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 9f56416684 Merge pull request #5037 from VOREStation/aro-updateicons
Rewrite human/update_icons()
2018-03-11 21:03:10 -05:00
Verkister f54383b995 vr 2018-03-09 22:59:47 +02: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
Verkister 8cffc2298c Readies our borg stuff for next sync fixes.
-Fixes the default module icon missing from our _vr.dmi
-Makes our custom modules enable ui_style_vr to pull the hud icon from our dmi instead.
-Makes relogging etc not revert to default ui file if ui_style_vr is enabled for the borg.
-Moves the clumsy VS edit borg reset stuff to a more appropriate place.
-Adds the recently fixed attack anim offset fix and the ui_style_vr to the reset module.
2018-03-07 11:29:46 +02:00
Verkister f554062103 Couple borg UI fixes.
-Fixes missing default module UI icons.
-Fixes the UI mudule icons breaking on relog. (oh please who the fuck puts a ..() at the top when the parent proc is nothing but a single return???)
2018-03-07 10:19:06 +02:00
Nerezza 9d7f7a7e5e Misc rig fixes/tweaks
EVA suit no longer stores toolboxes because those use a volume inventory.

CE's suit no longer holds pickaxes and ore satchels, but can now hold inflatables.

Adjusted get_breath_from_internal() proc to disable rig internals if the helmet is retracted and no suitable mask is in place.

Adjusted the internals button to ignore offline rigs.
2018-03-06 13:49:14 -06: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
Arokha Sieyes 6da9eb5451 Fix HUD creation and ventcrawling 2018-02-21 17:47:19 -05:00
Arokha Sieyes e248b89b7b POLARIS: Player-controlled SA QOL 2018-02-15 01:49:53 -06:00
Arokha Sieyes 02e490af7a VS: Implement shadekin as a legit big deal 2018-02-15 01:15:24 -06:00
Arokha Sieyes 5c08ee7a2a POLARIS: Simple Animal Player QOL
Adds a HUD when controlling a simple animal. Allows intents, mostly harm and help if they don't have hands. Disarm and grab if they do. Gives them a generic hud, and adds a var to decide if they have hands or not. Adds a var printed to any client that joins into a mob to explain how to play them, or lore stuff, or whatever you feel like.
2018-02-15 01:15:22 -06:00
Aronai Sieyes 52fe8ba6e4 Make Darksight Great Again (#4626)
* Polaris port of darksight adjusting

* I really need to stop doing this, don't I?
2018-01-25 18:01:33 -06:00
Arokha Sieyes 947a59e926 POLARIS: Make eyes adjust in the dark
Based on how dark it is, how much darksight you have, etc.
2018-01-24 01:59:55 -05:00
Leshana 436d48b337 Update VOREStation specific code to use merged in features.
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
2018-01-19 18:15:47 -05:00
Arokha Sieyes ff228754b3 Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Arokha Sieyes 9c86e3b5d7 Upstream merge of material scanner overlay 2018-01-17 17:44:46 -05:00
Arokha Sieyes f2fef6f410 Planes Framework (#4545)
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Arokha Sieyes 1b180a8fd3 POLARIS: The return of the material scanner overlay 2018-01-14 19:26:54 -05:00
Arokha Sieyes ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
Neerti cca2cc5a23 Adds Berserk 2018-01-11 01:35:14 -05:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Neerti afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
killer653 468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Andrew 460908e485 Attempted Travis Fix
Adds r. in front of emagged_items in the hud section
2017-07-29 20:48:02 -05:00
Andrew 36e4adaf8f Modifies Illegal Equipment Module
+Illegal equipment module now scrambled equipment module
+Scrambled equipment module now unlocks emagged borg items without
actually emagging the borg, allowing for AI sync, law updates, and being
emagged.
+Makes the miner borg diamond drill appear in all cases of being
upgraded or emagged instead of only if emagged while the mining module
is equipped.

Changelog includes all my previous PRs as well for ease of access to the
changes by the general public. I can trim it down to just this PR if
requested.
2017-07-29 17:32:33 -05:00
Leshana 5a02b7e5c7 More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-10 22:41:51 -04:00
Leshana e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
Leshana 8b34429c3e Initial implementation of holomaps! 2017-05-19 23:18:29 -04:00
Leshana 44ff1a70c6 Removes the datum pool, as it is not performant.
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
Anewbe 5ff71f926c Merge pull request #3362 from LorenLuke/Changeling-Visual
Fixes roundstart changeling visual bug
2017-04-28 14:50:51 -05:00
LorenLuke 7aa0c344a3 Fixes roundstart changeling visual bug. 2017-04-24 10:15:24 -07:00
LorenLuke 69a8d84344 Fixes a few errors. 2017-04-11 00:39:21 -07:00
Leshana baf8e2d143 Fix handcuff hud icons appearing on the left and right hand inventory hud slots when handcuffed.
We define the inventory screen objects for hands to be special in that apply overlays to themselves for handcuffed.  By putting that logic on the screen object itself, we allow it to be expanded to other cases besides handcuffs in the future without conflict.
2017-03-10 22:06:05 -05:00
Anewbe 2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Neerti 8bf97faaef Another Big Technomancer PR
See PR for details.
2016-10-22 11:51:12 -04:00
Neerti a84e1033c2 Changeling/Wizard/Future Stuff Hud Button Fix
Hopefully this stops the roundstop changeling hud wonkiness.
2016-08-28 23:08:02 -04:00
Neerti 09a57710a2 Technomancer Additions/Fixes
Moves spell HUD so it doesn't cover instability warning.
Makes Instability radiate out towards other humans at sufficently high amounts.  People radiating instability will glow purple light.  It is adviced to keep your distance or you will get instability as well.
Mark can no longer be cast on the admin z-level.
Adds Gambit, a spell which will randomly give you (almost) any spell that exists.
Shield now causes a bit of instability when blocking.
Recall will bring anyone who is grabbed along for the ride when cast.
Disposable Teleporters now function correctly.
Instability decays faster.
2016-07-21 18:22:15 -04:00
Neerti 8a61641479 Some more work + prep for drydocking. 2016-07-08 20:38:34 -04:00
Neerti 20a3bd5b26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-06-26 20:14:29 -04:00
Neerti 53d60eb554 Does even more work.
NOTE: asphyxiation is broken!
2016-06-23 05:21:04 -04:00
Richard D'angelo 2de751a8ee Readded the click Catcher
To avoid losing the click catcher on the reloging

there we go, proper credits to
https://github.com/PsiOmegaDelta
2016-06-18 16:39:21 -03:00
Richard D'angelo 7ab5220f64 510 Improved Overlays
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

https://github.com/Baystation12/Baystation12/commit/7c2cc890abf840b1a9967bc26c36581301e7229c
2016-06-18 15:50:10 -03:00