paprkaandZomgPonies f98cfc75ec final stuff ...

Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2014-04-28 20:36:56 -04:00

..

__HELPERS

experimental getArea() proc.

2014-04-20 03:27:31 -04:00

_hooks

Missing file

2014-03-11 02:49:08 -04:00

_onclick

Fixed some bugged intents

2014-04-22 11:02:11 -04:00

ATMOSPHERICS

atmos: remove a few force-deletes in merge code

2014-04-20 03:37:46 -04:00

controllers

Because it use less instructions.

2014-04-20 03:27:17 -04:00

datums

Solar fixes

2014-04-27 17:39:56 -04:00

defines

qdel and Destroy() improvements, now done through objects/items/devices

2014-03-05 20:28:17 -05:00

FEA

Adding Ice back to vanilla BS12 ZAS

2013-11-07 06:48:47 -05:00

game

Fixes for Mloc, part 2.

2014-04-28 19:15:17 -04:00

js

…

modules

final stuff

2014-04-28 20:36:56 -04:00

TriDimension

…

unused

Virology - NanoUI, gameplay tweaks, bugfixes

2014-04-19 15:42:49 -04:00

WorkInProgress

Standardize windows.

2014-04-19 19:36:33 -04:00

ZAS

atmos: remove a few force-deletes in merge code

2014-04-20 03:37:46 -04:00

ZAS - oldbs12

ZAS overhaul

2014-02-22 23:10:37 -05:00

ZAS - vg

Going back to BS12 ZAS, permanently

2013-11-08 09:51:22 -05:00

global.dm

Effeciency Project: APC / Machinery power usage.

2014-03-08 17:03:29 -05:00

hub.dm

…

names.dm

Fixed the way Dionas get their names. Should help fluff.

2014-01-07 04:20:57 -05:00

setup.dm

YOOOOO0U. YOU GOT WHAT AH NEEEEEEEED

2014-03-11 02:28:58 -04:00

stylesheet.dm

Add colour to AI private channel (144.7)

2014-04-19 15:44:48 -04:00

world.dm

Forgot this file.

2014-04-19 19:44:46 -04:00