Rob Nelson 7832e1c26f PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN ...

Conflicts:
	.gitignore
	baystation12.dme
	code/_onclick/hud/screen_objects.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/media/tapedeck.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	html/changelog.html
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/in-hand/in-hand_sync_report.txt
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/tank.dmi

2014-07-31 18:58:49 -04:00

..

grenades

Added secrets - bomb log for more explosives

2014-07-23 19:02:47 +01:00

implants

…

melee

Separates the sharp flag into edge and sharp

2014-06-17 06:51:51 -04:00

storage

Hydroponics rewrite, details will be in PR. Big commit.

2014-07-25 11:10:01 -04:00

tanks

PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN

2014-07-31 18:58:49 -04:00

AI_modules.dm

…

alien_specific.dm

…

cards_ids.dm

The death of assistants. Long live civilians!

2014-06-27 17:57:18 -04:00

cash.dm

…

cigs_lighters.dm

You forgot 2 commas, NOW I'm annoyed :D

2014-06-09 01:23:12 -04:00

clown_items.dm

Stops buckled mobs from slipping (for now)

2014-07-13 06:48:17 -04:00

cosmetics.dm

…

defib.dm

…

dice.dm

Adds sharp and edge flags to appropriate items

2014-06-17 07:08:25 -04:00

dna_injector.dm

Runtime fix / removing extra testing messages

2014-06-17 00:16:59 -04:00

explosives.dm

…

extinguisher.dm

Thrown items can be targeted, has miss chance...

2014-07-16 09:53:34 -04:00

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Fixed up the stupid handcuff shit that's been bugging me forever.

2014-06-17 10:26:04 -04:00

hydroponics.dm

Hydroponics rewrite, details will be in PR. Big commit.

2014-07-25 11:10:01 -04:00

kitchen.dm

Eating with utensils now produces the eating sound, fixed #5687

2014-07-20 05:56:06 -04:00

manuals.dm

Space Law book link fix

2014-06-16 14:04:17 +01:00

mop.dm

…

ninja_manuscript.dm

…

paint.dm

Nextgen lighting #2: Lights

2014-06-20 12:07:46 -04:00

paiwire.dm

…

power_cells.dm

…

RCD.dm

…

RCS.dm

…

RSF.dm

…

scrolls.dm

…

shields.dm

…

stunbaton.dm

Compile fix

2014-07-26 11:34:50 -04:00

surgery_limbattachment.dm

…

surgery_tools.dm

Separates the sharp flag into edge and sharp

2014-06-17 06:51:51 -04:00

swords_axes_etc.dm

…

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

…

tools.dm

Fixes human internal organs list

2014-07-13 08:51:55 -04:00

twohanded.dm

Completed adding Kidan Ambassador decorations

2014-07-23 13:24:51 -04:00

vending_items.dm

…

weaponry.dm

Spearbug

2014-07-23 15:50:33 -04:00

wires.dm

…