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
050aa30eb1
Merge pull request #2817 from MagmaRam/defib_fix_please_make_this_the_last_one_please_god
...
Defibs should revive people now.
2016-11-24 13:26:03 -06:00
MagmaRam
eef853393e
Defibs should revive people now.
...
This might be an unnecessary fix, I might just have the worst luck.
But I couldn't get a defib to res in 10 tries before this,
got it on the second after.
2016-11-24 00:30:05 -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
Anewbe
07b5b6fc1c
Defibs should actually work now
2016-11-21 19:18: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
MagmaRam
ac81408cf9
Merge pull request #2724 from Anewbe/signing
...
Ports sign language
2016-11-14 14:51:48 -06:00
Anewbe
8e5f9444f7
Fixes the autopsy scanner bugging on print
2016-11-14 14:14:25 -06:00
Arokha Sieyes
6022963815
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into defib
...
# Conflicts:
# icons/obj/device.dmi
2016-11-12 14:55:16 -05:00
Anewbe
62c973f631
Merge pull request #2729 from Yoshax/uplinks
...
Resolves mercs not spawning with an uplink
2016-11-12 13:40:41 -06:00
Yoshax
418ea1b0ba
Resolves mercs not spawning with an uplink
2016-11-12 18:13:45 +00:00
Anewbe
3a33b6221d
More thing fixes
2016-11-12 12:01:44 -06:00
Anewbe
5e9b885b43
Actually fixes the stuff
2016-11-12 11:29:23 -06:00
Arokha Sieyes
f3b155b6f3
Switch << to 'to_chat'
2016-11-12 10:35:02 -05:00
Arokha Sieyes
2ea72d692f
Drag to apply, reduced to 2 charges
...
More balanced maybe? More like 'rounding problems' dividing 1000 by 3 and having it work right.
2016-11-11 22:59:31 -05:00
Anewbe
d453a8dc5b
Fixes the Sign over Radio bug
2016-11-11 19:58:46 -06:00
Anewbe
da90b87802
Ports Bay's tape recorders
2016-11-11 00:10:55 -06:00
Arokha Sieyes
f1eed186d3
Change to 'normal' cell
...
Per staff request
2016-11-11 00:48:46 -05:00
Arokha Sieyes
5c45086406
Change Adjacent() to get_dist()
2016-11-11 00:35:27 -05:00
Arokha Sieyes
91b61945cc
Adds defibrilator kit
...
Adds a defib kit. Not ported from /tg/, not a backpack or anything. It's more like an AED than anything. Click with empty hand or drag onto yourself to take the pads out, and put them into some dead person's uniform slot.
Currently has 3 attempts with 75% chance of success with the default battery.
The paddles are cabled, so if you walk away with them it yanks the cable out and you have to reconnect them. Patient can't be moving either, and it won't shock living people (someone can code an emag thing for that I guess?).
(Excludes .dme addition)
2016-11-11 00:35:20 -05:00
Anewbe
2352001cfb
Adds teargas grenades, currently aspawn only
2016-11-10 22:53:59 -06:00
MagmaRam
660b22101b
Fix for health analyzers only showing multiples of 100% for health.
2016-11-06 16:55:49 -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
Neerti
09030f8e8f
Merge pull request #2673 from Anewbe/cuff_port
...
Kills Telecuffs
2016-10-24 19:28:44 -04:00
Yoshax
8c68671b3b
Resolves an uplink issue
2016-10-24 23:11:55 +01: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
96767a6d05
Merge pull request #2647 from Anewbe/flashlight_device_cells
...
Flashlights use device cells
2016-10-16 17:34:54 -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
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
d76e4cd075
Flashlights use device cells
2016-10-16 13:30:38 -05:00
Anewbe
591d2719f3
Should fix penlights asking for cells
2016-10-14 21:29:03 -05:00
Anewbe
0def0f6789
Flashlight fixes
2016-10-12 23:20:19 -05:00
Anewbe
5bfc0c851e
Changes the way embedding works
2016-10-11 21:29:49 -05:00
Yoshax
b9e871bf5b
Quick flashlight fix
2016-10-10 02:27:58 +01:00
Spades
570c2474c3
Fixes w_class of items to be consistent with Polaris update ( #636 )
...
* Fixes w_class of items to be consistent with Polaris update
* Typo
2016-10-09 19:23:10 -04:00
Eearslya Sleiarion
868413c880
Polaris Sync October 9th ( #633 )
2016-10-09 18:55:29 -04:00
Neerti
2e5c127ac8
Merge pull request #2616 from Anewbe/low_emp
...
Fixes low-yield EMP grenades
2016-10-09 13:24:56 -04:00
Anewbe
dacbca746c
Fixes low-yield EMP grenades
2016-10-08 19:38:49 -05:00
Anewbe
771d8b9e4b
Adds a smaller device cell for use in non-weapon devices
2016-10-08 15:34:18 -05:00
Anewbe
9ff32b5914
Weapon Cell Oversight fixes
2016-10-07 21:48:21 -05:00
