killer653
63ae45159d
Tempest item, saddle adjustments
2017-02-21 20:55:09 -05:00
Arokha Sieyes
e4557b0724
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2017-02-14 20:29:57 -05:00
Leshana
283b58e93d
Fixes dragging clothing with storage onto an occupied hand
...
* If you mouse-drag certain items onto a hand which is already holding something, the item goes into limbo.
* The reason this happens is that the standard code handling drags is directly calling usr.u_equip, despite the comment on that proc clearly saying never to do that. So it just throws it to limbo and the next line attempting to put it in hand does nothing becuase the hand is occupied. Better way is to call unEquip, so the item will drop on the ground if it fails.
* Fixes https://github.com/VOREStation/VOREStation/issues/394
2017-02-09 14:49:13 -05:00
Arokha Sieyes
8f18996133
This should be the other way around
2017-02-06 16:21:06 -05:00
Arokha Sieyes
935ff411a5
Adds cloneloss to DNA Injectors
...
Makes sense, doesn't it? Messing with your genes? Each one doubles your cloneloss, starting at 2.
2017-02-06 16:01:28 -05:00
Anewbe
47a1fe134a
Merge pull request #2978 from nachomeep/master
...
Adds fannypacks.
2017-02-05 18:07:01 -06:00
nachomeep
c2ed062b3f
Fixes custom loadout and slot system.
2017-02-02 15:37:27 -05:00
Cameron653
9cd1919fc6
Reverts vox change I made
2017-02-02 14:35:14 -05:00
nachomeep
c81b18b40a
adds fannypacks
...
To custom loadout as well.
2017-02-01 18:31:49 -05:00
Cameron653
82d021eb47
Makes vox tank spawn with nitrogen instead of phoron
2017-02-01 15:59:50 -05:00
killer653
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05:00
Anewbe
ccfbd7c9ac
Mining outpost camera console should work now
2017-01-29 15:25:53 -06:00
Anewbe
a6782f4371
Merge pull request #2944 from Anewbe/vox_toys
...
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
Arokha Sieyes
d70d85220a
Adds hypo for CMO and adds vials in chem for them to use
2017-01-24 01:47:57 -05:00
Anewbe
ac4b355f5e
Surgical tools will no longer cause damage on help intent
2017-01-21 18:34:05 -06:00
Anewbe
e23f5c2dd0
Vox airtank fix
2017-01-20 18:04:12 -06:00
Anewbe
f1d37c241d
Light boxes should be able to hold 24 bulbs/tubes now
2017-01-19 16:05:31 -06:00
Spades
9b61d10a0a
Merge pull request #837 from Cameron653/master
...
January Polaris Sync and various fixes
2017-01-19 00:39:08 -05:00
Anewbe
81c8570ba8
Merge pull request #2904 from Anewbe/theUnboxingBegins
...
Returns the Vox, who now breath Phoron
2017-01-17 23:49:14 -05:00
Anewbe
d53cfc4773
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
...
# Conflicts:
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
# icons/mob/human_face.dmi
# icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Anewbe
e63176c2e6
Tweaks some emotes
2017-01-16 18:48:00 -06:00
Arokha Sieyes
e4b6ace4d5
Further language implant fix
...
It just can't be a child of the other language implant at all.
Fixes #838
2017-01-16 15:33:01 -05:00
killer653
832418c7c9
Polaris sync
2017-01-15 18:12:15 -05:00
Anewbe
0286be65ff
Ports Bay's custodial bag tweaks
2017-01-14 23:44:16 -06:00
Arokha Sieyes
6cf76748eb
Fix language/EAL implant.
...
Polaris added an item with the exact same path, hence the weird behavior of the EAL implant teaching you every language. Two items with the same path = weirdness. Should be better now.
2017-01-14 02:32:02 -05:00
Anewbe
60df31fc41
Merge pull request #2902 from Neerti/1/2/2017_circuit_permanent_revolution
...
Permanent Revolution Circuit DLC
2017-01-08 14:42:25 -05:00
Anewbe
2c86a0a465
Returns the Vox, who now breath Phoron
2017-01-06 17:49:39 -06:00
Neerti
97ebf0924d
Permanent Revolution Update
2017-01-04 04:41:30 -05:00
Anewbe
4ef3cf7ff1
Improves QoL for universal recorders
2016-12-30 21:35:44 -06:00
killer653
0c73b9da2e
Polaris December Sync
2016-12-10 09:51:11 -05:00
MagmaRam
c5b77fcf9e
Adds an implant that allows humans to speak EAL.
...
It's available in the loadout for 2 points.
2016-12-01 22:22:46 -06:00
Anewbe
f6d311093a
Merge pull request #2807 from MagmaRam/door_tape
...
Tape can't be put on doors infinitely.
2016-11-22 21:57:11 -06:00
MagmaRam
14a68d6dcd
Tape can't be put on doors infinitely.
2016-11-22 21:36:05 -06:00
Techhead
e679590204
Allows breaking tape with any object.
...
The previous system was arbitrary, considering you can use your bare hands.
Resolves #14642
2016-11-21 00:07:35 +00:00
Yoshax
55c0fc86a3
Fixes up and implements the experimental welding tool
2016-11-20 18:59:06 +00:00
MagmaRam
20b6d4be57
Merge pull request #2718 from Anewbe/teargas
...
Adds teargas grenades, currently aspawn only
2016-11-15 20:05:35 -06:00
Anewbe
8e5f9444f7
Fixes the autopsy scanner bugging on print
2016-11-14 14:14:25 -06:00
Anewbe
2352001cfb
Adds teargas grenades, currently aspawn only
2016-11-10 22:53:59 -06:00
Arokha Sieyes
d100c30821
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
...
# Conflicts:
# html/changelogs/.all_changelog.yml
# icons/mob/hud.dmi
# maps/polaris-1.dmm
Fake conflicts from a merge error previously. No real conflicts.
2016-11-04 15:42:32 -04:00
Neerti
7dadc5f6f9
Merge pull request #2658 from Anewbe/waistcoat
...
Waistcoats are accessories
2016-10-24 19:33:12 -04:00
Anewbe
6d1d18a585
Kills telecuffs
2016-10-23 21:31:12 -05:00
Anewbe
b523406b27
Returns some functionality to the waistcoat, adds cham tie
2016-10-23 00:31:06 -05: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
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
Anewbe
fa53b659a4
Should fix the tape thing.
2016-10-17 16:52:20 -05: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
Anewbe
44ac6b1b58
Tape rolls need to get a grip
2016-10-16 15:29:48 -05:00
Anewbe
bea401be2d
Fixes device cells
2016-10-16 13:42:16 -05:00
Anewbe
5bfc0c851e
Changes the way embedding works
2016-10-11 21:29:49 -05:00
Eearslya Sleiarion
868413c880
Polaris Sync October 9th ( #633 )
2016-10-09 18:55:29 -04:00
