Jack Edge 27d6c284ed Merge branch 'fun-balloon' into shuttle-processing ...

Conflicts:
	_maps/shuttles/emergency_bar.dmm
	_maps/shuttles/emergency_narnar.dmm
	code/modules/spells/spell_types/wizard.dm

2016-06-25 16:26:22 +01:00

..

DB_ban

adds edit to job tempbans

2016-06-23 23:23:27 +10:00

permissionverbs

…

verbs

Code review

2016-06-23 00:40:28 +01:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_verbs.dm

Merge branch 'master' into random-space

2016-06-20 13:06:08 +01:00

admin.dm

Adds Asteroid emergency shuttle to station (#18125)

2016-06-02 15:48:08 -05:00

banappearance.dm

…

banjob.dm

…

create_mob.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

create_object.dm

…

create_poll.dm

…

create_turf.dm

…

fun_balloon.dm

Merge branch 'fun-balloon' into shuttle-processing

2016-06-25 16:26:22 +01:00

holder2.dm

…

ipintel.dm

Makes ipintel only warn, fixes some cache things.

2016-06-17 03:54:42 -07:00

IsBanned.dm

Makes ipintel only warn, fixes some cache things.

2016-06-17 03:54:42 -07:00

NewBan.dm

…

player_panel.dm

Fix wizard follow button not working

2016-05-29 00:20:34 -03:00

secrets.dm

Code review

2016-06-23 00:40:28 +01:00

sql_notes.dm

…

stickyban.dm

…

topic.dm

Merge pull request #18714 from coiax/fridge-magnet

2016-06-21 08:46:17 -04:00

watchlist.dm

…