PsiOmegaDelta 13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs ...

Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm

2015-10-10 12:05:36 +02:00

..

callproc

Replace ';' with '; // do nothing' for clarity

2015-09-10 04:00:37 +01:00

DB ban

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

2015-09-26 08:48:37 +02:00

permissionverbs

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

secrets

Fixes new unbalanced tag.

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

verbs

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30

view_variables

Cherrypicked xenophage-rewrite mechanics over.

2015-09-21 20:36:45 +09:30

admin_attack_log.dm

Improved admin logging.

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

admin_investigate.dm

…

admin_memo.dm

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

admin_ranks.dm

small sanity check.

2014-11-17 02:28:20 -08:00

admin_report.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

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-freeze' into dev

2015-09-27 13:48:33 +02:00

admin.dm

Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs

2015-09-07 13:57:09 +09:30

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

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

map_capture.dm

Added more help/error messages to the tool.

2015-10-08 12:36:09 +03:00

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

Add proc/crash_with, fix two incorrect qdel calls

2015-09-23 13:29:54 +01:00

player_panel.dm

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

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

topic.dm

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

2015-10-01 09:48:51 +02:00

ToRban.dm

Updates ToR list URL

2015-07-25 03:27:46 +03:00