skull132 22c7748336 Merge branch 'master' into development ...

# Conflicts:
#	code/game/machinery/computer/shuttle.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/objects/items/weapons/weaponry.dm
#	code/modules/admin/admin_attack_log.dm
#	code/modules/admin/admin_verbs.dm

2017-05-27 20:11:54 +03:00

..

dead

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

freelook

Various Bugfixes (#2463)

2017-05-27 12:40:18 +03:00

language

Changes tajaran random name generator (#2036)

2017-04-08 00:30:47 +03:00

living

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

new_player

Job subsystem & Player Spawn Tweaks (#2403)

2017-05-23 12:10:30 +03:00

animations.dm

…

death.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

dview.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

emote.dm

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

gender.dm

…

hear_say.dm

Fixes hear_say (#2465)

2017-05-27 12:43:22 +03:00

holder.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

inventory.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

login.dm

UDP Logging (#1997)

2017-04-01 23:47:00 +03:00

logout.dm

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

mob_cleanup.dm

…

mob_defines.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

mob_grab_specials.dm

Letting skull touch logging is now strictly haram (#2476)

2017-05-27 18:56:22 +03:00

mob_grab.dm

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

mob_helpers.dm

Changes wizard checks and fix wizard apprentices (#2307)

2017-05-21 03:44:16 +03:00

mob_movement.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

mob_transformation_simple.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

mob.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

say.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

transform_procs.dm

Removes all \red and \blue's (#2309)

2017-05-21 12:07:57 +03:00

typing_indicator.dm

…

update_icons.dm

…