DJSnapshotandZomgPonies e1af1f4713 replaced electrodes with insta hit taser beams. ...

Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/projectile/beams.dm
	icons/obj/projectiles.dmi

2014-04-19 16:28:23 -04:00

..

__HELPERS

Undershirts and rolling down jumpsuits!

2014-04-19 16:17:14 -04:00

_hooks

Missing file

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

_onclick

Xenos update

2014-03-03 00:08:06 -05:00

ATMOSPHERICS

Code Effeciency Project: Vent scrubbers have a bit more sanity.

2014-04-19 16:05:45 -04:00

controllers

Revert the new lighting system.

2014-04-07 23:51:35 +02:00

datums

Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed.

2014-04-19 15:51:07 -04:00

defines

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

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

FEA

…

game

replaced electrodes with insta hit taser beams.

2014-04-19 16:28:23 -04:00

js

…

modules

replaced electrodes with insta hit taser beams.

2014-04-19 16:28:23 -04:00

TriDimension

…

unused

Virology - NanoUI, gameplay tweaks, bugfixes

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

WorkInProgress

Swap NT Rep and Customs Officer costs

2014-04-15 00:37:27 +09:30

ZAS

Reverted unrelated ZAS modification and unnecessary check.

2014-02-28 17:50:12 -05:00

ZAS - oldbs12

ZAS overhaul

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

ZAS - vg

…

global.dm

Effeciency Project: APC / Machinery power usage.

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

hub.dm

…

names.dm

…

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

YOOOOO0U. YOU GOT WHAT AH NEEEEEEEED

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