Ikarrus d2ef043690 Resolved Conflicts: ...

code/modules/mob/living/living.dm

2015-06-11 23:46:59 -06:00

..

__DEFINES

Merge pull request #9139 from Xhuis/pray_4_fun

2015-06-11 02:58:46 +03:00

__HELPERS

Makes my strip_html_properly() removal compile.

2015-06-11 16:30:38 +02:00

_globalvars

Fixes admin stealth failing to be actual stealth due to href reading or and the pop-out window.

2015-05-20 09:26:26 -03:00

_onclick

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

ATMOSPHERICS

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

controllers

Removes strip_html_properly(), replaces it with html_encode().

2015-06-11 15:37:41 +02:00

datums

Merge pull request #9802 from Miauw62/AyeEye

2015-06-11 14:13:52 -05:00

game

Resolved Conflicts:

2015-06-11 23:46:59 -06:00

js

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

LINDA

Pressure_resistance Tweaks

2015-06-03 23:22:25 -05:00

modules

Resolved Conflicts:

2015-06-11 23:46:59 -06:00

orphaned procs

Gang Update

2015-06-10 23:05:58 -06:00

_compile_options.dm

…

hub.dm

…

world.dm

Merge pull request #9735 from Jordie0608/whyevenhavetwoverbs

2015-06-05 16:43:13 -05:00