Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi

2017-01-31 17:44:38 +01:00

..

DB ban

…

permissionverbs

…

verbs

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-31 17:44:38 +01:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_verbs.dm

…

admin.dm

…

banappearance.dm

…

banjob.dm

…

buildmode.dm

…

create_mob.dm

…

create_object.dm

…

create_poll.dm

…

create_turf.dm

…

holder2.dm

…

IsBanned.dm

…

machine_upgrade.dm

…

NewBan.dm

…

player_panel.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-31 17:44:38 +01:00

secrets.dm

…

sql_notes.dm

…

stickyban.dm

…

topic.dm

…

ToRban.dm

…

watchlist.dm

…