Arokha Sieyes
5de7a29ca4
Tweaks to restore a few VS things
2016-10-21 01:00:59 -04:00
Arokha Sieyes
cfff650f29
More merge conflict fixing that didn't happen before, plus fix rolling down khi jumpsuits, and change my own spacesuit
2016-10-21 00:18:46 -04:00
Arokha Sieyes
92833e335c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.
# Conflicts:
# code/datums/uplink/ammunition.dm
# code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
# code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
# 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/gamemodes/technomancer/spells/projectile/chain_lightning.dm
# code/game/gamemodes/technomancer/spells/projectile/overload.dm
# code/game/gamemodes/technomancer/spells/projectile/projectile.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/science.dm
# code/game/machinery/recharger.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/flashlight.dm
# code/game/objects/items/weapons/power_cells.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/client/preference_setup/loadout/loadout_shoes.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/client/preference_setup/loadout/loadout_xeno.dm
# code/modules/clothing/spacesuits/void/station.dm
# code/modules/integrated_electronics/assemblies.dm
# code/modules/integrated_electronics/input_output.dm
# code/modules/integrated_electronics/tools.dm
# code/modules/mob/living/carbon/carbon_defense.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/organs/blood.dm
# code/modules/paperwork/faxmachine.dm
# code/modules/projectiles/dnalocking.dm
# code/modules/projectiles/effects.dm
# code/modules/projectiles/guns/energy.dm
# code/modules/projectiles/guns/energy/laser.dm
# code/modules/projectiles/guns/energy/nuclear.dm
# code/modules/projectiles/projectile/bullets.dm
# code/modules/research/designs.dm
# html/changelogs/.all_changelog.yml
# html/changelogs/Anewbe - Beret.yml
# html/changelogs/Anewbe - Tape Roll.yml
# html/changelogs/MagmaRam-PR-2631.yml
# html/changelogs/Redstryker - EMTVoidsuits.yml
# icons/mob/head.dmi
# icons/mob/items/lefthand_hats.dmi
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_hats.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/skrell/helmet.dmi
# icons/mob/species/skrell/suit.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/mob/species/tajaran/suit.dmi
# icons/mob/species/unathi/helmet.dmi
# icons/mob/species/unathi/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/species/seromi/hats.dmi
# icons/obj/clothing/species/seromi/suits.dmi
# icons/obj/clothing/species/skrell/hats.dmi
# icons/obj/clothing/species/skrell/suits.dmi
# icons/obj/clothing/species/tajaran/hats.dmi
# icons/obj/clothing/species/tajaran/suits.dmi
# icons/obj/clothing/species/unathi/hats.dmi
# icons/obj/clothing/species/unathi/suits.dmi
# icons/obj/clothing/suits.dmi
# icons/obj/power.dmi
# maps/RandomZLevels/stationCollision.dm
# maps/polaris-1.dmm
# maps/polaris-2.dmm
2016-10-20 21:24:07 -04:00
Arokha Sieyes
3a564a655e
Merge pull request #666 from Screemonster/bugmonstertweaks
...
Multiple xenochimera tweaks
2016-10-20 21:01:20 -04:00
Arokha Sieyes
7ff0d1e1e5
Merge pull request #668 from VOREStation/issuebreaker
...
Fix for several issues (455,443,239)
2016-10-20 20:59:29 -04:00
Arokha Sieyes
95a3c14925
This fixes a bunch of things so here's each file change and why:
...
global_lists_vr.dm - Removes generic 'suit' which included basically any outerwear, and the invisible magical storage/internal
storage/internal.dm - Don't name the storage inside suits the same as the suit. It causes weird name-alignment problems where if you delete the suit it might just delete the internal storage, or the other way around.
Dreaming.dm - Added some vorish stuff I made up.
belly_vr.dm - Fixes for digesting items and how that works, and how to prevent them from showing up on the HUD. Also fixes IDs falling onto the floor (among other things).
living_vr.dm - Just in case, adds null-entry cleanup to belly cleanup proc.
bellymodes_vr.dm - Removes previous null-item hotfix.
vorepanel_vr.dm - Adds zero-width space to make items in belly wrap and not look horrible.
skim.dmf - Adds Y hotkey for whisper, and 6 hotkey for subtle.
Closes #455
Closes #443
Closes #239
2016-10-20 16:34:34 -04:00
Arokha Sieyes
6d533df04f
Merge pull request #663 from JoanRisu/Fluff_Items_worshop
...
Fluff items worshop....5? Sequels are hard.
2016-10-20 12:38:15 -04:00
Screemonster
e59c33b554
fixes and improves some bugs
2016-10-20 04:03:46 +01:00
Spades
6b1a32a12f
Merge pull request #664 from VOREStation/unifroms
...
Further tweak to tempest hud
2016-10-19 21:23:44 -04:00
Arokha Sieyes
f4c0239ab5
Further tweak to tempest hud
2016-10-19 20:23:23 -04:00
JoanRisu
ae797f1e85
quick hotfix
2016-10-19 17:05:53 -07:00
JoanRisu
1bc67f334b
Lots changes. Mostly involves getting the charges for Aro's gun and my Dominator, attempts to fix Molener's items, little typos fixes here and there. Also changes some item sprites.
2016-10-19 17:02:14 -07:00
Spades
8ca3d2eaaf
Merge pull request #662 from VOREStation/unifroms
...
Fed and KHI Uniforms/Suits
2016-10-19 19:56:38 -04:00
JoanRisu
60d3b937b9
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop
2016-10-19 14:07:51 -07:00
Arokha Sieyes
3acc33c3a5
Fed and KHI Uniforms/Suits
...
Adds Joan's Fed overcoats and my KHI uniforms as optional alternate uniforms for departments. Each requires you to be in that department to let you spawn with it.
(The Kitsuhana.dmi change is a change to my own synth sprite to fix a sprite error, unrelated)
(Also updates the sprite in custom_clothes_vr.dmi for an item for Tempest for her medhud)
2016-10-19 15:20:35 -04:00
Spades
a1d76ae136
Merge pull request #660 from VOREStation/oocformat
...
OOC sanitize like Flavor sanitize
2016-10-18 14:47:28 -04:00
Spades
d908eccf95
Merge pull request #659 from VOREStation/disallow-empty-ooc-notes
...
Force having OOC notes set to spawn
2016-10-18 14:47:19 -04:00
Spades
af4ef14bc6
Merge pull request #653 from VOREStation/fix541-again
...
Fixes attacking from inside voremobs, again
2016-10-18 14:47:03 -04:00
Arokha Sieyes
5616752804
OOC sanitize like Flavor sanitize
...
I was sick of OOC flavortext not creating links, not allowing linebreaks, etc. So I made it do those things. Now it's the same as normal flavortext instead of a "completely unformatted hellscape of trying to read".
2016-10-18 11:52:28 -04:00
Eearslya
334cb48dab
Force having OOC notes set to spawn
2016-10-17 23:25:07 -07:00
Anewbe
33b00b8762
Lowers the dislocate chance and damage from disarm intent hits
2016-10-16 21:47:42 -05:00
Eearslya
066e50e61e
Fixes attacking from inside voremobs, again
...
Fixes #541
2016-10-16 15:36:47 -07:00
Neerti
b2e3f37213
Merge pull request #2620 from redstryker/ICEMTUC
...
Emergency Medical Response Voidsuit
2016-10-16 17:30:19 -04:00
Neerti
561e2709dd
Merge pull request #2622 from Anewbe/actual_embed_changes
...
Changes the way embedding works
2016-10-16 17:27:52 -04:00
Neerti
78a1e1cf48
Merge pull request #2631 from MagmaRam/bloodloss
...
Bloodloss balancing
2016-10-16 17:26:41 -04:00
MagmaRam
e066506ccb
Blunt weapons can no longer cause cuts.
...
This is a necessary change for the intended effect of this bloodloss
system.
2016-10-16 15:53:04 -05:00
MagmaRam
289d32c23a
Used the wrong defines for the organ tags, whoops.
2016-10-16 15:52:17 -05:00
Spades
f4402f5d94
Fixes lights overlapping big mobs. Sort of.
2016-10-16 16:42:39 -04:00
Anewbe
bea401be2d
Fixes device cells
2016-10-16 13:42:16 -05:00
Arokha Sieyes
285914f1e5
Merge pull request #651 from VOREStation/arofluff
...
Adds KH life crystal fluff/loadout item
2016-10-14 10:17:51 -04:00
Arokha Sieyes
a11d4d202e
Small tweak
...
Just optimized it so it wouldn't stay being processed if the user leaves via elevator/cryo or is admin-deleted.
2016-10-14 02:34:58 -04:00
Arokha Sieyes
00405946a4
Adds KH life crystal fluff/loadout item
...
It just exists as a fluff excuse as to how you get cloned offsite if you don't get cloned at CC, if you want an alternative. The little lore behind it is that it notifies an offsite agency if you die so you can get cloned by them. It has a little paper in the carrying case explaining that.
It's a uniform accessory, or you can just pocket it. They are unmarked, so finding a broken one shouldn't be very interesting evidence or influence much outside just the fluff idea of their existence.
(Also, it's a crystal, but no it's not magic. The manual goes into detail about the power source, transmitter, etc.)
2016-10-14 01:52:28 -04:00
MagmaRam
c10b145782
Made bleeding from staunched wounds dynamic
...
yoshax did the thing etc
2016-10-13 22:36:00 -05:00
Anewbe
7a26fa94e3
Fixes the world >> "no sound" issue
2016-10-13 18:06:42 -05:00
Spades
ab9c5fc67e
Merge pull request #642 from Eearslya/fix306-blank-items-hotfix
...
Hotfix for blank items in bellies
2016-10-13 15:40:06 -04:00
Spades
6d59ebc548
Merge pull request #638 from Cameron653/master
...
Adds taur specific voidsuits to areas
2016-10-13 15:39:53 -04:00
Spades
c20e79509a
Merge pull request #648 from Dhaeleena/kiiteh_Titteh
...
Adds Female tajara sprite back to the game.
2016-10-13 15:38:49 -04:00
Dhaeleena
c5fe33dcdb
This adds the Deform sprites for the new female tajaran torso (Clone damage)
2016-10-13 09:32:40 -03:00
MagmaRam
b141a993de
More tweaks that Yoshax should get credit for
2016-10-12 22:02:56 -05:00
MagmaRam
45d1dcc966
Merge branch 'bloodloss' of https://github.com/MagmaRam/polaris
2016-10-12 22:00:33 -05:00
Dhaeleena
a9f331842e
Adds Female tajara sprite back to the game. Resolves Issue #629 Thank DeepIndigo for the sprites.
2016-10-12 23:16:18 -03:00
MagmaRam
38a037edb3
Optimization tweak, credit to Yoshax
2016-10-12 15:59:18 -05:00
MagmaRam
bdf3dde514
Readd bleeding from open surgery stages.
2016-10-12 07:28:22 -05:00
MagmaRam
0fd5631c27
Bloodloss now depends on wound type and limb
2016-10-12 07:20:35 -05:00
MagmaRam
59d2608fbb
Bruises now bleed at a much higher damage threshold.
2016-10-11 22:28:57 -05:00
Anewbe
5bfc0c851e
Changes the way embedding works
2016-10-11 21:29:49 -05:00
Dhaeleena
b9bded2132
Adds Synthetic Zeng-Hu brand Tajaran tail as a custom tail.
2016-10-11 15:28:48 -03:00
Dhaeleena
266daf39b8
Added Tajaran alternate head for Zeng-Hu synth manufacturer
2016-10-11 13:47:01 -03:00
Eearslya
66342af864
Fix solar assembly behavior while in inventory
2016-10-10 03:03:48 -07:00
Eearslya
1d9954e3cf
Prevent pseudo-item-duplication in bellies
2016-10-10 02:03:49 -07:00
