MrPerson 9229f72573 Fix up certain chemicals to not overwrite Del(). Meh. ...

Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm

2015-03-21 23:04:53 -07:00

..

admin

Merge pull request #8403 from MrPerson/no_bug_here

2015-03-20 04:36:32 +00:00

assembly

Initial say cleanup commit.

2015-03-18 19:23:31 +01:00

awaymissions

Makes the message when you're attacked slightly bigger for better visibility."

2015-03-12 23:15:54 +01:00

client

Removed commented out regenerate_icons()

2015-03-19 21:35:24 -07:00

clothing

Merge pull request #8418 from Incoming5643/Absolute_territory

2015-03-20 17:10:41 +01:00

crafting

Reverts the goonchem pathing. It is back to /datum/reagent now.

2015-03-18 19:22:11 -07:00

detectivework

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Fix up certain chemicals to not overwrite Del(). Meh.

2015-03-21 23:04:53 -07:00

flufftext

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

food&drinks

seriously where did these lines come from

2015-03-19 19:35:02 -04:00

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

Merge pull request #8058 from Iamgoofball/explosive

2015-03-21 09:54:11 +03:00

library

Initial say cleanup commit.

2015-03-18 19:23:31 +01:00

mining

Fix runtime.

2015-03-16 00:44:10 +00:00

mob

Merge pull request #8462 from xxalpha/cyberimplants

2015-03-21 13:38:27 +01:00

nano

Auto load required nanoui files on client login

2015-02-25 12:25:21 +13:00

ninja

Moves ninja shoes into the ninja folder

2015-03-09 23:02:26 +00:00

paperwork

Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger

2015-03-15 12:30:27 +01:00

power

Merge remote-tracking branch 'upstream/master' into catwalkmachines

2015-03-20 17:02:00 +00:00

procedural mapping

Removes 2 commented out lines.

2015-02-15 14:01:45 +00:00

projectiles

Fix up certain chemicals to not overwrite Del(). Meh.

2015-03-21 23:04:53 -07:00

reagents

Fix up certain chemicals to not overwrite Del(). Meh.

2015-03-21 23:04:53 -07:00

recycling

Merge pull request #8334 from MrPerson/cleanup_crew_comin_through

2015-03-15 01:55:39 -05:00

research

Fix up certain chemicals to not overwrite Del(). Meh.

2015-03-21 23:04:53 -07:00

scripting

Updates/fixes to NTSL

2015-01-03 17:43:43 -08:00

security levels

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

shuttle

Improves shuttle corner fix to use actual appearance data of the turf, so it takes transform into consideration.

2015-01-19 18:48:52 +00:00

surgery

Fixed bugs.

2015-03-21 11:53:54 +00:00

telesci

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00