PsiOmega 7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm

2015-02-27 09:06:48 +01:00

..

DB ban

…

permissionverbs

…

verbs

Dev merge.

2015-02-21 19:49:47 +10:30

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

small sanity check.

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

admin_report.dm

…

admin_verbs.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro

2015-02-11 14:35:58 +10:30

admin.dm

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

2015-02-27 09:06:48 +01:00

banjob.dm

…

create_mob.dm

…

create_object.dm

Larger job and preferences windows but still lesser than 764. More choices in "Quick Create Object" menu.

2014-05-04 18:11:11 +04:00

create_turf.dm

…

holder2.dm

…

IsBanned.dm

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

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

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

…

player_panel.dm

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

topic.dm

Merged with dev.

2015-02-24 17:03:39 +10:30

ToRban.dm

…