Cael_Aislinn eb02fb3636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	baystation12.dme
	code/modules/events/event_manager.dm
	code/modules/events/ion_storm.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-02-11 02:56:07 +10:00

..

__HELPERS

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

ATMOSPHERICS

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

controllers

restructured/cleaned up how admin-pms are sent (retained original code just in case), made it so that only holders with R_ADMIN can see private messages, added a timeout warning to anyone PMing a player so they dont get spammed (default to 5 seconds, config edited)

2013-02-10 21:29:02 +10:00

datums

removed debug print

2013-02-07 05:48:19 +04:00

defines

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 01:02:27 +10:00

FEA

- Added null checks for get_mobs_in_radio_range().

2013-01-17 06:52:49 +00:00

game

fixed some admin colour OOC bugs, restructured/cleaned up how OOC messages are sent (retained original code commented out, in case)

2013-02-10 21:27:54 +10:00

js

…

modules

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-02-11 02:56:07 +10:00

TriDimension

Revert "Revert pull request #1605 and #1606 due to temperature bugs killing the crew" since that code did not touch any temperature things, or even any ZAS things and I got no answers even after asking for about 18 hours...

2012-08-12 18:41:27 -07:00

unused

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

WorkInProgress

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

ZAS

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

global.dm

removed some duplicate events code brought in by mistake during tg port, fixed space ninja spam, renamed 'NSV Exodus' to 'NSS Exodus'

2013-01-21 04:56:20 +10:00

hub.dm

fix for internals spawning empty

2012-09-22 22:46:02 +10:00

names.dm

>Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever

2012-10-24 14:39:36 +00:00

setup.dm

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

stylesheet.dm

unique voice text colour for soghun, skrell and taj

2013-02-10 22:36:23 +10:00

world.dm

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00