deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization ...

# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi

2017-12-08 19:58:41 -05:00

..

camera

…

dead

Merge pull request #33324 from deathride58/foreignfurryaddswidescreen

2017-12-08 10:35:23 -06:00

living

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

death.dm

…

inventory.dm

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

login.dm

Merge pull request #33324 from deathride58/foreignfurryaddswidescreen

2017-12-08 10:35:23 -06:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

mob_helpers.dm

Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00

mob_movement.dm

Makes reverse pulling only apply to dense objects (#33024)

2017-11-24 13:00:10 -06:00

mob_transformation_simple.dm

…

mob.dm

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

say_readme.dm

…

say_vr.dm

…

say.dm

Merge branch 'master' into upstream-merge-32624

2017-12-04 17:12:53 -05:00

status_procs.dm

…

transform_procs.dm

Merge pull request #32871 from AnturK/orbitclean

2017-11-19 17:13:08 -06:00

update_icons.dm

…