Cheridan 66304667cf Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3 ...

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/datums/uplink_item.dm

2014-10-06 19:27:14 -05:00

..

grenades

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

implants

Doubles the amount of TC and the prices of uplink items.

2014-09-21 15:56:24 +02:00

melee

Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3

2014-10-06 19:27:14 -05:00

storage

Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3

2014-10-06 19:27:14 -05:00

tanks

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

2014-08-29 04:21:15 -07:00

AI_modules.dm

Removes confusion because players cannot understand my genius.

2014-06-20 14:55:04 +02:00

airlock_painter.dm

Hopefully final pass of object -> mob examine switch

2014-08-20 07:07:30 -07:00

cards_ids.dm

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

2014-08-29 04:21:15 -07:00

cigs_lighters.dm

Summon Events Initial Commit: See the pull for complete details

2014-08-21 20:05:41 -04:00

clown_items.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

cosmetics.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

dice.dm

now it's finished entirely \o/

2014-02-15 16:56:12 +01:00

dna_injector.dm

Ports Drones from NTstation + New Improvements/Features

2014-09-13 15:02:57 +01:00

explosives.dm

Standardizes name and path of plastique/plastic explosive/c4 to C4

2014-09-21 17:34:26 +10:00

extinguisher.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

flamethrower.dm

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

2014-03-21 03:05:39 -07:00

gift_wrappaper.dm

Growns: The OOPening.

2014-07-03 16:43:07 -05:00

handcuffs.dm

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

2014-06-19 02:27:10 +04:00

kitchen.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

manuals.dm

Fixing typos.

2014-09-15 19:50:34 +02:00

mop.dm

var rename. Gia's right, this was kinda confusing

2014-04-23 15:11:59 -07:00

paint.dm

Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.

2014-01-15 21:30:55 +00:00

paiwire.dm

pAIs added. Two on station (Crew Quarters, R&D Director's Office) and one on the Derelict.

2011-05-30 19:33:28 +00:00

power_cells.dm

Unidentinization

2014-05-13 02:18:21 +10:00

RCD.dm

Absolute paths for item files.

2014-08-07 23:02:43 +02:00

RSF.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

scrolls.dm

Fixes an issue with teleportation scrolls and mining vouchers that allow you to gain unlimited uses from them.

2014-03-02 05:00:57 -08:00

shields.dm

Absolute paths for item files.

2014-08-07 23:02:43 +02:00

singularityhammer.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

stunbaton.dm

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

2014-06-09 01:50:44 -07:00

table_rack_parts.dm

Cutting cables, too

2014-08-15 19:50:09 -06:00

teleportation.dm

Fixing issue where people can't hear their own emotes while inside lockers and the audible messages when also in the dark. Removing object_talk() proc (obsolete).

2014-09-14 16:17:16 +02:00

tools.dm

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

twohanded.dm

Merge pull request #3677 from Kelenius/dualsaberfix

2014-05-14 09:27:37 +01:00

vending_items.dm

Change examine() from an atom verb to a mob verb

2014-05-01 09:56:39 -07:00

weaponry.dm

Fixes up some silly problems with cursed items:

2014-09-15 19:22:25 -04:00