Tigercat2000 519992b5a9 Merge branch 'byond510' ...

Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme

2016-04-01 14:15:44 -07:00

..

grenades

Merge branch 'byond510'

2016-04-01 14:15:44 -07:00

implants

exploit fix

2016-01-18 23:56:17 -05:00

melee

Refactors Bot Weapon Identification

2016-02-12 14:52:50 -05:00

storage

Allows voice activators, etc to work in storage items

2016-03-25 20:13:18 -04:00

tanks

Allows tank nozzle to be pull outable while your hands are free but buckled eg to a janicart

2016-03-11 18:59:56 -05:00

AI_modules.dm

Makes the Protect Station board no longer consider people crew, instead of human""

2016-02-20 14:01:53 +00:00

alien_specific.dm

…

cards_ids.dm

…

cash.dm

…

caution.dm

…

chrono_eraser.dm

…

cigs.dm

Addiction Rework

2016-03-15 18:36:29 -04:00

clown_items.dm

Cleans up slipping code

2016-02-03 09:44:32 +00:00

cosmetics.dm

No longer, I hope.

2016-03-17 20:37:41 -04:00

courtroom.dm

…

defib.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

2016-02-24 06:27:16 -05:00

dice.dm

…

disks.dm

…

dna_injector.dm

Makes DNA swapping methods more reliable

2016-03-17 23:07:45 -07:00

dnascrambler.dm

Makes DNA swapping methods more reliable

2016-03-17 23:07:45 -07:00

explosives.dm

…

extinguisher.dm

…

fireworks.dm

…

flamethrower.dm

Assorted Sprite-Related Fixes

2015-12-18 08:45:30 -05:00

garrote.dm

Stun Value Adjustments

2016-03-21 23:07:19 -04:00

gift_wrappaper.dm

Prize Counter WIP commit

2016-02-12 00:32:21 -05:00

handcuffs.dm

Fixes Bear Trap IEDs and Duplicate Bear Traps

2016-02-05 23:29:20 -05:00

holosign.dm

…

kitchen.dm

eating refactor (#3733) + bugfixes

2016-03-05 08:03:39 +00:00

legcuffs.dm

Bolas now affect walking people

2016-02-08 10:10:37 +00:00

lighters.dm

Cigarette Pack Functionality

2016-01-19 02:49:00 -05:00

manuals.dm

…

misc.dm

…

mop.dm

refactors washing items

2016-02-20 12:01:40 +00:00

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

…

power_cells.dm

…

RCD.dm

…

RSF.dm

…

scissors.dm

No longer, I hope.

2016-03-17 20:37:41 -04:00

scrolls.dm

Various Ragin' Mages fixes

2016-01-13 21:56:56 -08:00

shards.dm

…

shields.dm

TG Riot Shield Port and Tweaks

2016-01-26 22:06:05 -05:00

signs.dm

…

soap.dm

…

staff.dm

…

stock_parts.dm

…

stunbaton.dm

refactors washing items

2016-02-20 12:01:40 +00:00

swords_axes_etc.dm

Refactors Bot Weapon Identification

2016-02-12 14:52:50 -05:00

syndie_uplink.dm

…

table_rack_parts.dm

Dismantling table parts now returns same amount of metal as was used in construction

2015-12-31 12:07:22 +01:00

tape.dm

…

teleportation.dm

consistency helps

2016-01-16 04:44:56 -05:00

tools.dm

510: HUD, Flash Refactor, Rip out unused pain system

2016-02-28 18:09:43 -08:00

twohanded.dm

lesser summon guns, wizman update

2016-01-29 09:12:37 -05:00

vending_items.dm

…

weaponry.dm

flavor tweaks

2016-03-14 05:26:05 -04:00

whetstone.dm

Ports Whetstones

2016-02-25 02:03:53 -05:00

wires.dm

…