418ea1b0ba
Resolves mercs not spawning with an uplink
2016-11-12 18:13:45 +00:00
3a33b6221d
More thing fixes
2016-11-12 12:01:44 -06:00
5e9b885b43
Actually fixes the stuff
2016-11-12 11:29:23 -06:00
f3b155b6f3
Switch << to 'to_chat'
2016-11-12 10:35:02 -05:00
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
d453a8dc5b
Fixes the Sign over Radio bug
2016-11-11 19:58:46 -06:00
da90b87802
Ports Bay's tape recorders
2016-11-11 00:10:55 -06:00
f1eed186d3
Change to 'normal' cell
...
Per staff request
2016-11-11 00:48:46 -05:00
5c45086406
Change Adjacent() to get_dist()
2016-11-11 00:35:27 -05:00
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
2352001cfb
Adds teargas grenades, currently aspawn only
2016-11-10 22:53:59 -06:00
660b22101b
Fix for health analyzers only showing multiples of 100% for health.
2016-11-06 16:55:49 -06:00
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
7dadc5f6f9
Merge pull request #2658 from Anewbe/waistcoat
...
Waistcoats are accessories
2016-10-24 19:33:12 -04:00
09030f8e8f
Merge pull request #2673 from Anewbe/cuff_port
...
Kills Telecuffs
2016-10-24 19:28:44 -04:00
8c68671b3b
Resolves an uplink issue
2016-10-24 23:11:55 +01:00
6d1d18a585
Kills telecuffs
2016-10-23 21:31:12 -05:00
b523406b27
Returns some functionality to the waistcoat, adds cham tie
2016-10-23 00:31:06 -05:00
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
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
fa53b659a4
Should fix the tape thing.
2016-10-17 16:52:20 -05:00
96767a6d05
Merge pull request #2647 from Anewbe/flashlight_device_cells
...
Flashlights use device cells
2016-10-16 17:34:54 -04:00
561e2709dd
Merge pull request #2622 from Anewbe/actual_embed_changes
...
Changes the way embedding works
2016-10-16 17:27:52 -04:00
44ac6b1b58
Tape rolls need to get a grip
2016-10-16 15:29:48 -05:00
bea401be2d
Fixes device cells
2016-10-16 13:42:16 -05:00
d76e4cd075
Flashlights use device cells
2016-10-16 13:30:38 -05:00
591d2719f3
Should fix penlights asking for cells
2016-10-14 21:29:03 -05:00
0def0f6789
Flashlight fixes
2016-10-12 23:20:19 -05:00
5bfc0c851e
Changes the way embedding works
2016-10-11 21:29:49 -05:00
b9e871bf5b
Quick flashlight fix
2016-10-10 02:27:58 +01:00
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
868413c880
Polaris Sync October 9th ( #633 )
2016-10-09 18:55:29 -04:00
2e5c127ac8
Merge pull request #2616 from Anewbe/low_emp
...
Fixes low-yield EMP grenades
2016-10-09 13:24:56 -04:00
dacbca746c
Fixes low-yield EMP grenades
2016-10-08 19:38:49 -05:00
771d8b9e4b
Adds a smaller device cell for use in non-weapon devices
2016-10-08 15:34:18 -05:00
9ff32b5914
Weapon Cell Oversight fixes
2016-10-07 21:48:21 -05:00
5fc4c4b889
Removes cell randomization and ensures slime flashlight things arent weird
2016-10-08 03:18:48 +01:00
24953efe7a
Fixes some issues
2016-10-07 18:00:48 +01:00
087b9072e0
Adds changelog
2016-10-07 16:15:25 +01:00
a723eb3732
Makes flashlights use cells
2016-10-07 15:59:24 +01:00
006197dbc6
Merge pull request #2603 from Yoshax/minorbugfixboogalo
...
Some bugfixes
2016-10-06 22:38:32 -05:00
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
c4203600fc
Fixes #2354
2016-10-07 03:54:37 +01:00
19e0342145
Resolves #2435
2016-10-07 03:43:28 +01:00
2330968176
Replaces Station Administrator
2016-10-06 22:38:02 -04:00
1a442aa7cc
Merge things
2016-10-06 21:37:10 -05:00
0f51fda83a
Energy weapons can be reloaded
2016-10-06 21:30:52 -05:00
7e79d9b5f8
Merge pull request #2596 from Neerti/10/5/2016_event_system
...
Cleans Up WIP Event System + New Grid Check For It
2016-10-06 20:45:55 -05:00
337ef499a1
Cleans Up WIP Event System + New Grid Check For It
...
Separates the 'count and assess everything' stuff to it's own datum, called the metric datum, which I plan to add on to in the future to make counting and metrics easier.
Makes decision process a bit more weight-based, will probably continue tweaking later.
Makes the admin debug UI have links to change settings easily.
Adds replacement for grid check event, which works similar to the old one, but is now based on a physical machine in the game world, that Engineering can hack to make the event end faster, if so desired. Note that the machine is not mapped in, and won't be mapped in until the event system is ready for launch.
Adds grid_check variables to SMESes and APCs to make them stop doing work without draining the battery.
Grid checks in the new system are caused by a "power spike" which originates from the engine and will cause bad things, should no grid checker machine be connected to the power-net. These power spikes occur when the GM decides that a grid check is a good event to have.
The grid checker can be built and deconstructed using the standard machine construction methods.
2016-10-05 21:40:07 -04:00
0d0322b93c
Adjusts shotgun ammo box contents
2016-10-03 21:48:16 -05:00
Yoshax