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
Anewbe and GitHub
1c4cebe162
Merge pull request #2681 from Yoshax/mightywings
...
Adds HUD Aviators
2016-10-26 10:30:36 -05:00
Yoshax
3d5146cf9a
Tacks on changelog
2016-10-25 18:54:25 +01:00
Yoshax
da00108515
Fixes an erroneous changelog entry
2016-10-25 18:44:56 +01:00
Yoshax
b25765d31b
Updates changelog
2016-10-25 01:21:29 +01:00
Anewbe
b6e1b67246
Sec gear tweaks
2016-10-24 18:50:14 -05:00
Neerti and GitHub
1e3a2791d6
Merge pull request #2655 from Anewbe/disarm_spam
...
Disarm spam is less effective
2016-10-24 19:34:07 -04:00
Yoshax
ef10b91484
Updates with new changelog entries
2016-10-24 23:32:50 +01:00
Yoshax
16ce0913ae
Changelog for #2657
2016-10-24 23:28:22 +01:00
Yoshax
a3169fb0c8
Changelog for #2663
2016-10-24 23:28:06 +01:00
Yoshax
5d264b1b78
Changelog for #2652
2016-10-24 23:27:54 +01:00
Yoshax
1c215ae911
Updates changelog
2016-10-24 23:20:18 +01:00
Anewbe and GitHub
5f466c8802
Merge pull request #2659 from Neerti/10/21/2016_new_gridcheck
...
Adds the new Grid Check event to rotation.
2016-10-23 13:35:36 -05:00
Anewbe
097f7e6009
Changes SecHUD icons.
2016-10-22 17:52:26 -05:00
Anewbe
a1b1cf62c8
Disarm spam is less effective
2016-10-22 13:02:26 -05:00
Neerti
bb489cb09f
Adds the new Grid Check event to rotation.
...
Maps in a new Grid Checker machine, located in an expanded substation room in Engineering. When a grid check happens, Engineering can hack that machine to restore power sooner. Wearing insulated gloves is highly recommended.
2016-10-21 12:47:57 -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
Anewbe
92629cc4de
The colorable berets should be more colorful.
2016-10-16 16:53:37 -05:00
Neerti and GitHub
96767a6d05
Merge pull request #2647 from Anewbe/flashlight_device_cells
...
Flashlights use device cells
2016-10-16 17:34:54 -04:00
Neerti and GitHub
b2e3f37213
Merge pull request #2620 from redstryker/ICEMTUC
...
Emergency Medical Response Voidsuit
2016-10-16 17:30:19 -04:00
Neerti and GitHub
561e2709dd
Merge pull request #2622 from Anewbe/actual_embed_changes
...
Changes the way embedding works
2016-10-16 17:27:52 -04:00
Neerti and GitHub
b0ebe0e4eb
Merge pull request #2648 from Anewbe/tape_roll
...
One requires a grip to use tape rolls on people
2016-10-16 17:26:53 -04:00
Anewbe
44ac6b1b58
Tape rolls need to get a grip
2016-10-16 15:29:48 -05:00
MagmaRam
00647ddb8a
Changelog for bloodloss.
2016-10-16 14:49:14 -05:00
Anewbe
c79b86e4fc
Changelog
2016-10-16 14:10:49 -05:00
Anewbe
5bfc0c851e
Changes the way embedding works
2016-10-11 21:29:49 -05:00
Yoshax
18318be180
Updates changelog
2016-10-10 02:34:54 +01:00
Eearslya Sleiarion and Spades
868413c880
Polaris Sync October 9th ( #633 )
2016-10-09 18:55:29 -04:00
redstryker
f615f74aed
Adds Changelog
2016-10-09 15:00:26 -04:00
Neerti and GitHub
32f87cac86
Merge pull request #2617 from Anewbe/cryo_batteries
...
Cryopods no longer eat the cells/ammo from weapons
2016-10-09 13:25:03 -04:00
Neerti and GitHub
2e5c127ac8
Merge pull request #2616 from Anewbe/low_emp
...
Fixes low-yield EMP grenades
2016-10-09 13:24:56 -04:00
Anewbe
7cf2373da8
Cryopods no longer eat the cells/ammo from weapons
2016-10-08 19:51:39 -05:00
Anewbe
dacbca746c
Fixes low-yield EMP grenades
2016-10-08 19:38:49 -05:00
Anewbe
860bff9816
Changelog
2016-10-08 15:50:08 -05:00
Anewbe and GitHub
426659c1d2
Merge pull request #2614 from redstryker/IDConsoleFix
...
Fixes ID Consoles
2016-10-08 11:58:03 -05:00
redstryker
192a5c8295
Fixes ID Consoles
2016-10-08 11:43:13 -04:00
Yoshax
e85f4a1c6e
Updates changelog
2016-10-08 15:53:36 +01:00
Anewbe
9ff32b5914
Weapon Cell Oversight fixes
2016-10-07 21:48:21 -05:00
Anewbe and GitHub
f4aeb10fdc
Merge pull request #2606 from Yoshax/flashlights
...
Makes flashlights use cells
2016-10-07 21:26:13 -05:00
Yoshax
5fc4c4b889
Removes cell randomization and ensures slime flashlight things arent weird
2016-10-08 03:18:48 +01:00
Anewbe and GitHub
5febffea2f
Merge pull request #2590 from SpadesNeil/jukebox-v2
...
Jukebox Hacking. Again. Now with 100% less copyrights.
2016-10-07 17:18:24 -05:00
Anewbe and GitHub
fc37a273b0
Merge pull request #2605 from redstryker/SpaceVault101Apparantly
...
Overseer Alt Title
2016-10-07 17:17:48 -05:00
Yoshax
087b9072e0
Adds changelog
2016-10-07 16:15:25 +01:00
redstryker
2331487ac0
Overseer Alt Title
2016-10-07 00:05:34 -04:00
Spades
961a9bfe6e
Changelog
2016-10-06 23:58:36 -04:00
redstryker
52ad7f144a
Changelog 10/6/2016 V2
2016-10-06 23:48:47 -04:00
Anewbe and GitHub
006197dbc6
Merge pull request #2603 from Yoshax/minorbugfixboogalo
...
Some bugfixes
2016-10-06 22:38:32 -05:00
Anewbe and GitHub
673e75832a
Merge pull request #2602 from SpadesNeil/death-to-the-administrator
...
Replaces Station Administrator with Colony Director, NASA Approved
2016-10-06 22:31:14 -05:00
Yoshax
760d5c3b54
Fixes #2258
2016-10-07 04:30:29 +01:00
Spades
f944692083
I demand credit!
2016-10-06 23:20:25 -04:00
Arokha Sieyes