ikarrus df285ff7b3 Resolved conflicts: ...

code/modules/mob/mob.dm

2014-06-13 09:04:30 -06:00

..

grenades

Changed the weighting on blast range, 4 turns out to be quite big so shouldn't happen too often

2014-06-12 01:09:58 +01:00

implants

Monkeys can be loyalty implanted

2014-05-16 22:17:06 -06:00

melee

Changed suicide messages to visible_messages and fixed relative pathing

2014-05-13 01:44:29 +10:00

storage

Cyborgs can no longer strip people or search storage items

2014-06-11 21:50:41 -06:00

tanks

Fix

2014-04-04 21:06:30 +08:00

AI_modules.dm

Fixes Robocop board not working

2014-05-27 15:59:10 -05:00

airlock_painter.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

cards_ids.dm

Changed mining equipment locker to mining equipment vendor

2014-05-06 20:01:01 +10:00

cigs_lighters.dm

…

clown_items.dm

…

cosmetics.dm

…

dice.dm

…

dna_injector.dm

…

explosives.dm

Changed suicide messages to visible_messages and fixed relative pathing

2014-05-13 01:44:29 +10:00

extinguisher.dm

Added a new gravity generator which will produce gravity for the station.

2014-03-15 16:59:48 +00: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

…

handcuffs.dm

Reverted stripping restrictions

2014-06-12 09:29:45 -06:00

kitchen.dm

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

2014-05-19 03:36:07 -04:00

manuals.dm

Changed the default wiki to tgstation13.org/wiki.

2014-04-20 19:20:33 +01:00

mop.dm

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

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

paint.dm

…

paiwire.dm

…

power_cells.dm

Unidentinization

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

RCD.dm

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

2014-03-26 18:14:48 -07:00

RSF.dm

…

scrolls.dm

…

shields.dm

…

singularityhammer.dm

…

stunbaton.dm

Warning message replaced by sparks sound

2014-06-02 01:42:50 +02:00

table_rack_parts.dm

2oop4u

2014-05-27 12:07:53 -07:00

teleportation.dm

…

tools.dm

Moved item_heal_robotic out of obj/item and into mob_helpers.dm

2014-06-05 19:25:08 -05:00

twohanded.dm

Merge pull request #3677 from Kelenius/dualsaberfix

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

vending_items.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

weaponry.dm

Unidentinization

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