Razharas a589387ccf Fixing merge conflicts ...

THis is getting harder and harder

2014-02-06 22:26:16 +04:00

..

ai_core.dm

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

aifixer.dm

Adds crlf default to .gitattributes for most text file types we use.

2014-02-04 15:14:39 +00:00

arcade.dm

Refactored card code to remove copypasted variable assignment. Card objects are now children of /obj/item/toy/cards.

2014-01-18 20:14:21 -05:00

atmos_alert.dm

code/game/machinery/computer/* lowercase pass

2013-11-18 18:54:40 +01:00

buildandrepair.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

camera.dm

Updates box2550away (again) (again) (again)

2014-02-04 20:30:13 +13:00

card.dm

Adds a deck of cards. Works like real cards, without all the shuffling.

2013-12-15 23:43:08 -05:00

cloning.dm

Semi-final update

2014-01-15 03:46:41 +04:00

communications.dm

Adds a deck of cards. Works like real cards, without all the shuffling.

2013-12-15 23:43:08 -05:00

computer.dm

Fixes the last few issues with the computer update.

2013-09-24 13:54:02 -07:00

crew.dm

code/game/machinery/computer/* lowercase pass

2013-11-18 18:54:40 +01:00

HolodeckControl.dm

Attack sounds for all melee weapons

2014-01-28 22:46:41 +13:00

law.dm

code/game/machinery/computer/* lowercase pass

2013-11-18 18:54:40 +01:00

medical.dm

Adds a deck of cards. Works like real cards, without all the shuffling.

2013-12-15 23:43:08 -05:00

message.dm

Adds ckey logging to PDA message sending

2013-12-29 15:26:11 -08:00

Operating.dm

Makes circuits into type paths. Dna modifiers had a bad string that showed up when converted into a type path. Power monitors are now actually computers. Makes smashing computers red.

2013-09-21 14:41:50 -07:00

pod.dm

code/game/machinery/computer/* lowercase pass

2013-11-18 18:54:40 +01:00

power.dm

code/game/machinery/computer/* lowercase pass

2013-11-18 18:54:40 +01:00

prisoner.dm

code/game/machinery/computer/* lowercase pass

2013-11-18 18:54:40 +01:00

robot.dm

Added the SetEmagged proc, for cyborgs, and replaced code to use it.

2014-01-22 20:00:39 +00:00

security.dm

code/game/machinery/computer/* lowercase pass

2013-11-18 18:54:40 +01:00

shuttle.dm

Shuttle launch timer cannot be shortened when less than 11 seconds are left.

2013-12-18 15:13:43 +01:00

station_alert.dm

code/game/machinery/computer/* lowercase pass

2013-11-18 18:54:40 +01:00

syndicate_shuttle.dm

Cleans up computer code severely. fixes issue #1004. Aliens and Monkeys can now smash computers. However, this only applies to computers with buildable circuit boards. Computers without boards are now impervious to attack and deconstruction(can't steal atmos computers or slash up the escape shuttle computer).

2013-09-17 13:22:39 -07:00

telecrystalconsoles.dm

code/game/machinery/computer/* lowercase pass

2013-11-18 18:54:40 +01:00