GunHog b655ade95e Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE ...

Conflicts:
	code/game/mecha/mecha.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-06-04 08:40:42 -05:00

..

__DEFINES

upgrades the HARDFEET species flag to PIERCEIMMUNE

2015-05-31 18:54:30 -04:00

__HELPERS

Merge pull request #9715 from Firecage/datumspaths

2015-06-02 23:04:51 -05: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

Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE

2015-06-04 08:40:42 -05:00

ATMOSPHERICS

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

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

controllers

Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome

2015-06-03 09:49:51 -05:00

datums

Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome

2015-06-03 09:49:51 -05:00

game

Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE

2015-06-04 08:40:42 -05:00

js

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

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

LINDA

Merge pull request #9699 from KorPhaeron/turf

2015-06-02 23:15:42 -05:00

modules

Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE

2015-06-04 08:40:42 -05:00

orphaned procs

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

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

_compile_options.dm

Buffs airlock crushing.

2015-04-11 11:41:15 +01:00

hub.dm

…

world.dm

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

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