mwerezak 229f4cb043 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color ...

Conflicts:
	code/modules/customitems/item_defines.dm

2015-04-26 02:04:59 -04:00

..

__HELPERS

Return strip_html_properly() back

2015-04-21 00:38:41 +03:00

_onclick

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

ATMOSPHERICS

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

controllers

Makes crit oxyloss and malf AI time run in gametime instead of realtime.

2015-04-23 04:42:58 -04:00

datums

Ensures Admin Deletes uses qdel.

2015-04-16 12:56:24 +02:00

defines

Clean server start.

2015-04-18 15:32:25 +02:00

FEA

…

game

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 02:04:59 -04:00

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 02:04:59 -04:00

TriDimension

…

ZAS

Clean server start.

2015-04-18 15:32:25 +02:00

global.dm

Merge remote-tracking branch 'upstream/dev' into CultPorting

2015-04-14 15:54:22 +02:00

hub.dm

…

names.dm

…

setup.dm

Updates clothing/under to use item_state_slots.

2015-04-23 08:03:40 -04:00

stylesheet.dm

Makes reflex shooting more obvious

2015-04-02 21:54:35 -04:00

world.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30