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

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

permissionverbs

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

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

Fixes a runtime when a null memo would be attempted to be

2016-08-31 00:27:09 -07:00

admin_ranks.dm

…

admin_verbs.dm

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

2017-01-20 23:43:35 +01:00

admin.dm

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

2017-01-20 23:43:35 +01:00

banappearance.dm

SQL sanitization fixes

2016-08-19 19:58:32 -04:00

banjob.dm

Moves from log_debug to log_runtime for non-fatal abberant states

2016-08-23 17:03:52 -07:00

buildmode.dm

Makes conveyors easier to place with buildmode, adds vars to autogibbers

2017-01-11 02:07:20 -08:00

create_mob.dm

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

create_object.dm

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

create_poll.dm

…

create_turf.dm

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

holder2.dm

…

IsBanned.dm

…

machine_upgrade.dm

…

NewBan.dm

Topic UID finishing touches

2016-09-08 13:07:14 -04:00

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

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

sql_notes.dm

…

stickyban.dm

…

topic.dm

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

2017-01-20 23:43:35 +01:00

ToRban.dm

…

watchlist.dm

…