PsiOmega 35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm

2015-08-29 10:06:18 +02:00

..

DB ban

…

permissionverbs

…

secrets

Fixes new unbalanced tag.

2015-08-21 19:26:20 +02:00

verbs

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-29 10:06:18 +02:00

admin_attack_log.dm

…

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_report.dm

…

admin_secrets.dm

Secret entries can now give a warning before being triggered.

2015-08-11 15:03:57 +02:00

admin_verbs.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-29 10:06:18 +02:00

admin.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

IsBanned.dm

…

map_capture.dm

Removed ingame capture link generation and fixed some bugs.

2015-08-15 14:04:25 +03:00

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

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

2015-07-29 11:57:17 +02:00

player_panel.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +02:00

topic.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

ToRban.dm

…