LetterJay f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 ...

# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm

2018-01-02 05:16:13 -06:00

..

DB_ban

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

permissionverbs

Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.

2017-12-13 21:04:00 -06:00

verbs

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-02 05:16:13 -06:00

admin_investigate.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

admin_ranks.dm

Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.

2017-12-13 21:04:00 -06:00

admin_verbs.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

admin.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

adminmenu.dm

JSON feedback

2017-11-17 01:44:12 -06:00

banjob.dm

[MIRROR] [s] Fixes datum antag is_banned (#3523)

2017-10-20 12:48:15 -05:00

chat_commands.dm

[MIRROR] Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round. (#4484)

2017-12-21 06:04:20 -08:00

create_mob.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

create_object.dm

Fix Create Object/Turf/Mob all having the same title (#32747)

2017-11-15 19:06:51 -06:00

create_poll.dm

Merge pull request #32007 from lzimann/poll

2017-10-23 19:37:05 -05:00

create_turf.dm

Fix Create Object/Turf/Mob all having the same title (#32747)

2017-11-15 19:06:51 -06:00

fun_balloon.dm

Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777

2017-12-28 02:53:47 +00:00

holder2.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

ipintel.dm

Update ipintel.dm

2017-09-29 23:42:35 -05:00

IsBanned.dm

Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.

2017-12-13 21:04:00 -06:00

NewBan.dm

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

player_panel.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

secrets.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

sound_emitter.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

sql_message_system.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

stickyban.dm

fixes spelling and stuff (#32531)

2017-11-09 11:04:50 -06:00

topic.dm

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

whitelist.dm

…